chore: Remove repetition on Dockerfile arguments

vmware-labs · Jan 17, 2023 · b3c123f · b3c123f
1 parent 72eca41
commit b3c123f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Dockerfile.wasi-builder b/Dockerfile.wasi-builder
@@ -1,6 +1,6 @@
-ARG WASM_BASE=20220116
+ARG WASM_BASE
 FROM ghcr.io/vmware-labs/wasm-base:${WASM_BASE}
-ARG WASI_SDK_VERSION=19
+ARG WASI_SDK_VERSION
 ENV WASI_SDK=wasi-sdk-${WASI_SDK_VERSION}
 ENV WASI_SDK_ROOT=/wasi-sdk
 ENV WASI_SDK_PATH=${WASI_SDK_ROOT}

diff --git a/Makefile.builders b/Makefile.builders
@@ -1,9 +1,11 @@
 BUILDER_ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 
+WASM_BASE_TAG ?= $(shell git rev-parse --short HEAD)
+
 .PHONY: wasm-base
 wasm-base:
-	docker build --build-arg BINARYEN_VERSION=111 -f ${BUILDER_ROOT_DIR}/Dockerfile.wasm-base -t ghcr.io/vmware-labs/wasm-base:20220116 ${BUILDER_ROOT_DIR}
+	docker build --build-arg BINARYEN_VERSION=111 -f ${BUILDER_ROOT_DIR}/Dockerfile.wasm-base -t ghcr.io/vmware-labs/wasm-base:$(WASM_BASE_TAG) ${BUILDER_ROOT_DIR}
 
 .PHONY: wasi-builder-19
 wasi-builder-19: wasm-base
-	docker build --build-arg WASI_SDK_VERSION=19 -f ${BUILDER_ROOT_DIR}/Dockerfile.wasi-builder -t ghcr.io/vmware-labs/wasi-builder:19 ${BUILDER_ROOT_DIR}
+	docker build --build-arg WASM_BASE=$(WASM_BASE_TAG) --build-arg WASI_SDK_VERSION=19 -f ${BUILDER_ROOT_DIR}/Dockerfile.wasi-builder -t ghcr.io/vmware-labs/wasi-builder:19 ${BUILDER_ROOT_DIR}
diff --git a/php/Dockerfile b/php/Dockerfile
@@ -1,4 +1,4 @@
-ARG WASI_SDK_VERSION=19
+ARG WASI_SDK_VERSION
 FROM ghcr.io/vmware-labs/wasi-builder:${WASI_SDK_VERSION}
 RUN DEBIAN_FRONTEND=noninteractive apt install -y \
       bison \

diff --git a/ruby/Dockerfile b/ruby/Dockerfile
@@ -1,4 +1,4 @@
-ARG WASI_SDK_VERSION=19
+ARG WASI_SDK_VERSION
 FROM ghcr.io/vmware-labs/wasi-builder:${WASI_SDK_VERSION}
 RUN DEBIAN_FRONTEND=noninteractive apt install -y \
       ruby \