diff --git a/container-build-info/Dockerfile b/container-build-info/Dockerfile index b14f3d9..29b4e14 100644 --- a/container-build-info/Dockerfile +++ b/container-build-info/Dockerfile @@ -1,12 +1,12 @@ # Modify these to update to newer versions -FROM node:22-alpine3.20@sha256:fc95a044b87e95507c60c1f8c829e5d98ddf46401034932499db370c494ef0ff -ARG BINARYEN_VERSION=116 -ARG RUST_VERSION=1.83.0 +FROM node:24-alpine3.23@sha256:7fddd9ddeae8196abf4a3ef2de34e11f7b1a722119f91f28ddf1e99dcafdf114 +ARG BINARYEN_VERSION=128 +ARG RUST_VERSION=1.94.0 ARG UID=1000 ARG GID=1000 -# set SOURCE_DATE_EPOCH for reproduciability - https://reproducible-builds.org/docs/source-date-epoch/ +# set SOURCE_DATE_EPOCH for reproducibility - https://reproducible-builds.org/docs/source-date-epoch/ ENV SOURCE_DATE_EPOCH=0 ENV ROOT_DIR=/home/node @@ -14,7 +14,7 @@ ENV METADATA_DIR=$ROOT_DIR/metadata RUN mkdir $METADATA_DIR ENV WORKDIR_DIR=$ROOT_DIR/build ENV PATH="$ROOT_DIR/.cargo/bin:$PATH" -RUN mkdir WORKDIR_DIR +RUN mkdir $WORKDIR_DIR WORKDIR $WORKDIR_DIR # Keep a copy of the Dockerfile used @@ -26,7 +26,7 @@ COPY Dockerfile /home/node/metadata/Dockerfile # those needed for undici RUN apk add -U clang lld wasi-sdk -# those needed for cjs-module-lexar +# those needed for cjs-module-lexer RUN apk add -U clang lld wasi-sdk make # those needed for amaro @@ -36,10 +36,10 @@ RUN apk add -U curl rust-wasm cmake gcc g++ bash make RUN apk info -v >/home/node/metadata/apk-info ################################### -# Non package insalls +# Non-package installs -# Install BINARYEN, there are only linux/arm64 tar.gz's after 116 -# If we expect a versoin to exist and we don't get one error out +# Install Binaryen from the official release archive for the current Linux arch. +# If the expected archive is unavailable for the selected version/arch, fail the build. RUN CURRENT_ARCH=`arch` && \ echo "ARCH:" $CURRENT_ARCH && \ wget https://github.com/WebAssembly/binaryen/releases/download/version_$BINARYEN_VERSION/binaryen-version_$BINARYEN_VERSION-$CURRENT_ARCH-linux.tar.gz || true && \ @@ -62,7 +62,7 @@ RUN CURRENT_ARCH=`arch` && \ ENV WASM_OPT=$WORKDIR_DIR/wasm-opt RUN echo "Binaryen-version: $BINARYEN_VERSION" >$METADATA_DIR/binaryen-info -RUN echo "Binaryen-url: https://github.com/WebAssembly/binaryen/releases/download/version_$BINARYEN_VERSION/binaryen-version_$BINARYEN_VERSION-$CURRENT_ARCH-linux.tar.gz" >>$METADATA_DIR/binaryen-info +RUN echo "Binaryen-url: https://github.com/WebAssembly/binaryen/releases/download/version_$BINARYEN_VERSION/binaryen-version_$BINARYEN_VERSION-$(arch)-linux.tar.gz" >>$METADATA_DIR/binaryen-info RUN echo "Binaryen-binary: $WASM_OPT" >>$METADATA_DIR/binaryen-info RUN chmod -R 777 $METADATA_DIR