From 37545faaddec96a7252010a61741133deb2275c9 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 12 Dec 2024 20:04:54 +0100 Subject: [PATCH 1/4] bump to v25.0 --- src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile index 9238a4ed..042b1d4f 100644 --- a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile @@ -26,15 +26,16 @@ RUN curl -sSL https://netcorenativeassets.blob.core.windows.net/resource-package && chmod +x /usr/local/bin/v8 # Install Wasi toolchain -ENV WASI_SDK_VERSION=22 +ENV WASI_SDK_VERSION=25.0 ENV WASI_SDK_PATH=/usr/local/wasi-sdk -ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-linux.tar.gz +ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz RUN mkdir -p ${WASI_SDK_PATH} \ && cd /tmp \ && curl -L -o /tmp/wasi-sdk.tar.gz ${WASI_SDK_URL} \ && tar --strip-components=1 -xvzf /tmp/wasi-sdk.tar.gz -C ${WASI_SDK_PATH} \ && echo ${WASI_SDK_VERSION} > ${WASI_SDK_PATH}/wasi-sdk-version.txt \ + && echo ${WASI_SDK_VERSION} > ${WASI_SDK_PATH}/WASI-SDK-VERSION-${WASI_SDK_VERSION} \ && rm /tmp/wasi-sdk.tar.gz ENV WASMTIME_VERSION=27.0.0 From 6509753655df3654554466674ed1ca950e7810b9 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 12 Dec 2024 20:16:50 +0100 Subject: [PATCH 2/4] more --- src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile index 042b1d4f..7696cee0 100644 --- a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile @@ -27,8 +27,9 @@ RUN curl -sSL https://netcorenativeassets.blob.core.windows.net/resource-package # Install Wasi toolchain ENV WASI_SDK_VERSION=25.0 +ENV WASI_SDK_MAJOR_VERSION=25 ENV WASI_SDK_PATH=/usr/local/wasi-sdk -ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz +ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_MAJOR_VERSION}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz RUN mkdir -p ${WASI_SDK_PATH} \ && cd /tmp \ From 2e00dc8c21cfd5f2e02151e7a085e03e47ea1f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 13 Dec 2024 12:00:47 +0100 Subject: [PATCH 3/4] Fix download url --- src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile index 7696cee0..b013cbfa 100644 --- a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile @@ -29,7 +29,7 @@ RUN curl -sSL https://netcorenativeassets.blob.core.windows.net/resource-package ENV WASI_SDK_VERSION=25.0 ENV WASI_SDK_MAJOR_VERSION=25 ENV WASI_SDK_PATH=/usr/local/wasi-sdk -ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_MAJOR_VERSION}/wasi-sdk-${WASI_SDK_VERSION}-linux.tar.gz +ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_MAJOR_VERSION}/wasi-sdk-${WASI_SDK_VERSION}-x86_64-linux.tar.gz RUN mkdir -p ${WASI_SDK_PATH} \ && cd /tmp \ From c9a12c82969bf6a3d227ef0ce414a3d1fb41cf1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 21 Feb 2025 17:27:24 +0100 Subject: [PATCH 4/4] Address Radek's comment --- src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile index b013cbfa..3b789ee0 100644 --- a/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile +++ b/src/azurelinux/3.0/net10.0/webassembly/amd64/Dockerfile @@ -26,8 +26,8 @@ RUN curl -sSL https://netcorenativeassets.blob.core.windows.net/resource-package && chmod +x /usr/local/bin/v8 # Install Wasi toolchain -ENV WASI_SDK_VERSION=25.0 ENV WASI_SDK_MAJOR_VERSION=25 +ENV WASI_SDK_VERSION=${WASI_SDK_MAJOR_VERSION}.0 ENV WASI_SDK_PATH=/usr/local/wasi-sdk ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_MAJOR_VERSION}/wasi-sdk-${WASI_SDK_VERSION}-x86_64-linux.tar.gz