Skip to content

Commit 844158d

Browse files
committed
chore: Remove repetition on Dockerfile arguments
1 parent 4847e6e commit 844158d

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Dockerfile.wasi-builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG WASM_BASE=20220116
1+
ARG WASM_BASE
22
FROM ghcr.io/vmware-labs/wasm-base:${WASM_BASE}
3-
ARG WASI_SDK_VERSION=19
3+
ARG WASI_SDK_VERSION
44
ENV WASI_SDK=wasi-sdk-${WASI_SDK_VERSION}
55
ENV WASI_SDK_ROOT=/wasi-sdk
66
ENV WASI_SDK_PATH=${WASI_SDK_ROOT}

Makefile.builders

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
BUILDER_ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
22

3+
WASM_BASE_TAG ?= $(shell git rev-parse --short HEAD)
4+
35
.PHONY: wasm-base
46
wasm-base:
5-
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}
7+
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}
68

79
.PHONY: wasi-builder-19
810
wasi-builder-19: wasm-base
9-
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}
11+
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}

php/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG WASI_SDK_VERSION=19
1+
ARG WASI_SDK_VERSION
22
FROM ghcr.io/vmware-labs/wasi-builder:${WASI_SDK_VERSION}
33
RUN DEBIAN_FRONTEND=noninteractive apt install -y \
44
bison \

ruby/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG WASI_SDK_VERSION=19
1+
ARG WASI_SDK_VERSION
22
FROM ghcr.io/vmware-labs/wasi-builder:${WASI_SDK_VERSION}
33
RUN DEBIAN_FRONTEND=noninteractive apt install -y \
44
ruby \

0 commit comments

Comments
 (0)