TinyGo: use WASI supported version

Signed-off-by: mathetake <[email protected]>

Author: mathetake

data/extension/init/templates/tinygo/envoy.filters.http/default/go.sum

@@ -7,6 +7,8 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tetratelabs/proxy-wasm-go-sdk v0.0.1 h1:HMaVuxBYaqqPF324hbxg10OB8feQQwFU6EWlzh6LW8M=
 github.com/tetratelabs/proxy-wasm-go-sdk v0.0.1/go.mod h1:oriMCq3KvyEkgWVKr5B9DauvzpQ4Qy5eb32hxPa83Dw=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.2 h1:nJVDdX6v/Mn0IbiogBv4cJvil4mHmBubML+3KZIWe/A=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.2/go.mod h1:oriMCq3KvyEkgWVKr5B9DauvzpQ4Qy5eb32hxPa83Dw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

go.mod

@@ -29,7 +29,6 @@ require (
 	github.com/tetratelabs/getenvoy-package v0.0.0-20190730071641-da31aed4333e
 	github.com/tetratelabs/log v0.0.0-20190710134534-eb04d1e84fb8
 	github.com/tetratelabs/multierror v1.1.0
-	github.com/tetratelabs/proxy-wasm-go-sdk v0.0.2 // indirect
 	gotest.tools v2.2.0+incompatible
 	istio.io/api v0.0.0-20200227213531-891bf31f3c32
 	istio.io/istio v0.0.0-20200304114959-c3c353285578

go.sum

@@ -653,8 +653,6 @@ github.com/tetratelabs/log v0.0.0-20190710134534-eb04d1e84fb8 h1:a7FN/XPymdzttMa
 github.com/tetratelabs/log v0.0.0-20190710134534-eb04d1e84fb8/go.mod h1:w+dEBsxcYEFg0I6whrgkMzjD8GBBQgmDq9hykB30pt8=
 github.com/tetratelabs/multierror v1.1.0 h1:cKmV/Pbf42K5wp8glxa2YIausbxIraPN8fzru9Pn1Cg=
 github.com/tetratelabs/multierror v1.1.0/go.mod h1:kH3SzI/z+FwEbV9bxQDx4GiIgE2djuyb8wiB2DaUBnY=
-github.com/tetratelabs/proxy-wasm-go-sdk v0.0.2 h1:nJVDdX6v/Mn0IbiogBv4cJvil4mHmBubML+3KZIWe/A=
-github.com/tetratelabs/proxy-wasm-go-sdk v0.0.2/go.mod h1:oriMCq3KvyEkgWVKr5B9DauvzpQ4Qy5eb32hxPa83Dw=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=

images/extension-builders/tinygo/Dockerfile

@@ -16,23 +16,34 @@
 # Builder image for Envoy Wasm extensions written in Go.
 #
 
+# TODO: use upstream TinyGo after https://github.com/tinygo-org/tinygo/pull/1373 is merged
+
+FROM golang:1.15
+
+RUN git clone --recursive -b non-js-wasm https://github.com/mathetake/tinygo tinygo
+WORKDIR tinygo
+RUN apt-get update && apt-get -y install cmake clang ninja-build
+ENV CC=clang
+ENV CXX=clang++
+
+RUN make llvm-source
+RUN make llvm-build
+RUN make wasi-libc
+RUN make tinygo
+
+RUN rm -rf ./llvm-project ./llvm-build
+
 FROM golang:1.15
 
-ENV TINYGO_VERSION=0.15.0
+COPY --from=0 /go/tinygo /usr/local/lib/tinygo
 
-RUN wget https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo_${TINYGO_VERSION}_amd64.deb
-RUN dpkg -i tinygo_${TINYGO_VERSION}_amd64.deb && rm tinygo_${TINYGO_VERSION}_amd64.deb
+RUN ln -s /usr/local/lib/tinygo/build/tinygo /usr/local/bin/tinygo
+RUN tinygo env
 
 ENV GOCACHE=/source/.gocache
 ENV GOMODCACHE=/source/.gomodcache
 ENV XDG_CACHE_HOME=/source/.cache
 
-ENV TINYGO_SDK_NAME=github.com/tetratelabs/proxy-wasm-go-sdk
-ENV TINYGO_SDK_VERSION=v0.0.2
-ENV TINYGO_SDK_PATH=${GOMODCACHE}/${TINYGO_SDK_NAME}@${TINYGO_SDK_VERSION}
-
-RUN mkdir -p ${TINYGO_SDK_PATH} && git clone https://${TINYGO_SDK_NAME} -b ${TINYGO_SDK_VERSION} ${TINYGO_SDK_PATH}
-
 COPY ./entrypoint.sh /usr/local/getenvoy/extension/builder/entrypoint.sh
 COPY ./tinygo/commands.sh /usr/local/getenvoy/extension/builder/commands.sh
 ENTRYPOINT ["/usr/local/getenvoy/extension/builder/entrypoint.sh"]