Use upstream wasi-sdk docker image (envoyproxy#146)

arminabf · Feb 8, 2023 · 687967d · 687967d
1 parent b894c28
commit 687967d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 80 deletions.
diff --git a/.github/workflows/buildtools-wasi-sdk.yaml b/.github/workflows/buildtools-wasi-sdk.yaml
diff --git a/buildtools/tinygo/Dockerfile b/buildtools/tinygo/Dockerfile
@@ -4,10 +4,11 @@
 ARG WASI_LIBC_IMAGE
 FROM --platform=linux/amd64 ${WASI_LIBC_IMAGE:-ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-tinygo-wasi-libc:main} AS wasi-libc
 
-FROM ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-wasi-sdk:main
+FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-19
 
 ARG TARGETARCH
 
+RUN apt-get update && apt-get install -y curl
 RUN curl -L https://go.dev/dl/go1.19.2.linux-${TARGETARCH:-amd64}.tar.gz | tar -xz
 
 ENV PATH /go/bin:/root/go/bin:$PATH

diff --git a/buildtools/tinygo/wasi-libc.Dockerfile b/buildtools/tinygo/wasi-libc.Dockerfile
@@ -1,9 +1,9 @@
 # Copyright 2022 The OWASP Coraza contributors
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-wasi-sdk:main
+FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-19
 
-RUN apt-get install -y git
+RUN apt-get update && apt-get install -y git
 
 RUN git clone https://github.com/tinygo-org/tinygo --branch dev
 WORKDIR /tinygo

diff --git a/buildtools/wasi-sdk/Dockerfile b/buildtools/wasi-sdk/Dockerfile