File tree Expand file tree Collapse file tree 4 files changed +8
-6
lines changed Expand file tree Collapse file tree 4 files changed +8
-6
lines changed Original file line number Diff line number Diff line change 1- ARG WASM_BASE=20220116
1+ ARG WASM_BASE
22FROM ghcr.io/vmware-labs/wasm-base:${WASM_BASE}
3- ARG WASI_SDK_VERSION=19
3+ ARG WASI_SDK_VERSION
44ENV WASI_SDK=wasi-sdk-${WASI_SDK_VERSION}
55ENV WASI_SDK_ROOT=/wasi-sdk
66ENV WASI_SDK_PATH=${WASI_SDK_ROOT}
Original file line number Diff line number Diff line change 11BUILDER_ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
22
3+ WASM_BASE_TAG ?= $(shell git rev-parse --short HEAD)
4+
35.PHONY: wasm-base
46wasm-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
810wasi-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}
Original file line number Diff line number Diff line change 1- ARG WASI_SDK_VERSION=19
1+ ARG WASI_SDK_VERSION
22FROM ghcr.io/vmware-labs/wasi-builder:${WASI_SDK_VERSION}
33RUN DEBIAN_FRONTEND=noninteractive apt install -y \
44 bison \
Original file line number Diff line number Diff line change 1- ARG WASI_SDK_VERSION=19
1+ ARG WASI_SDK_VERSION
22FROM ghcr.io/vmware-labs/wasi-builder:${WASI_SDK_VERSION}
33RUN DEBIAN_FRONTEND=noninteractive apt install -y \
44 ruby \
You can’t perform that action at this time.
0 commit comments