diff --git a/plugins/wasm-go/DockerfileBuilder b/plugins/wasm-go/DockerfileBuilder index 3c0479747..120951e11 100644 --- a/plugins/wasm-go/DockerfileBuilder +++ b/plugins/wasm-go/DockerfileBuilder @@ -1,64 +1,11 @@ -# The Dockerfile for wasm-go builder only support amd64 and arm64 yet. -# If you want to build on another architecture, the following information may be helpful. -# -# - arch: amd64 -# base image: docker.io/ubuntu -# go_url: https://golang.google.cn/dl/go1.20.1.linux-amd64.tar.gz" -# tinygo_url: https://github.com/alibaba/higress/releases/download/v1.0.0-rc/higress-tinygo0.25.0.linux-amd64.tar.gz -# oras_url: https://github.com/oras-project/oras/releases/download/v1.0.0/oras_1.0.0_linux_amd64.tar.gz -# -# - arch: arm64 -# base image: docker.io/ubuntu -# go_url: https://golang.google.cn/dl/go1.20.1.linux-arm64.tar.gz -# tinygo_url: https://github.com/alibaba/higress/releases/download/v1.0.0-rc/higress-tinygo0.25.0.linux-arm64.tar.gz -# oras_url: https://github.com/oras-project/oras/releases/download/v1.0.0/oras_1.0.0_linux_arm64.tar.gz -# -# - arch: armel -# base image: build yourself -# go_url: install from source code -# tinygo_url: build yourself -# oras_url: build your self -# -# - arch: i386 -# base image: build yourself -# go_url: https://dl.google.com/go/go1.20.1.linux-386.tar.gz -# tinygo_url: build yourself -# oras_url: build your self -# -# - arch: mips64el -# base image: build your self -# go_url: https://dl.google.com/go/go1.20.1.linux-386.tar.gz -# tinygo_url: build your self -# oras_url: build your self -# -# - arch: ppc64el -# base image: build your self -# go_url: https://dl.google.com/go/go1.20.1.linux-ppc64le.tar.gz -# tinygo_url: build your self -# oras_url: build your self -# -# - arch: s390x -# base image: docker.io/ubuntu -# go_url: https://dl.google.com/go/go1.20.1.linux-s390x.tar.gz -# tinygo_url: build your self -# oras_url: build your self -# -# - arch: armhf -# base image: build your self -# go_url: https://golang.google.cn/dl/go1.20.1.linux-armv6l.tar.gz -# tinygo_url: https://github.com/tinygo-org/tinygo/releases/download/v0.25.0/tinygo_0.25.0_armhf.deb -# oras_url: build your self - ARG BASE_IMAGE=docker.io/ubuntu FROM $BASE_IMAGE -ARG GO_VERSION=1.24.0 -ARG TINYGO_VERSION=0.30.0 +ARG GO_VERSION=1.24.4 ARG ORAS_VERSION=1.0.0 ARG HIGRESS_VERSION=1.0.0-rc -ARG USE_HIGRESS_TINYGO=false -LABEL go_version=$GO_VERSION tinygo_version=$TINYGO_VERSION oras_version=$ORAS_VERSION +LABEL go_version=$GO_VERSION oras_version=$ORAS_VERSION RUN apt-get update && apt-get install -y wget tar && rm -rf /var/lib/apt/lists/* @@ -69,20 +16,10 @@ RUN set -e; \ case "$arch" in \ 'amd64') \ go_url="https://golang.google.cn/dl/go${GO_VERSION}.linux-amd64.tar.gz"; \ - if [ "$USE_HIGRESS_TINYGO" = "true" ]; then \ - tinygo_url="https://github.com/alibaba/higress/releases/download/v${HIGRESS_VERSION}/higress-tinygo${TINYGO_VERSION}.linux-amd64.tar.gz"; \ - else \ - tinygo_url="https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo${TINYGO_VERSION}.linux-amd64.tar.gz"; \ - fi; \ oras_url="https://github.com/oras-project/oras/releases/download/v${ORAS_VERSION}/oras_${ORAS_VERSION}_linux_amd64.tar.gz"; \ ;; \ 'arm64') \ go_url="https://golang.google.cn/dl/go${GO_VERSION}.linux-arm64.tar.gz"; \ - if [ "$USE_HIGRESS_TINYGO" = "true" ]; then \ - tinygo_url="https://github.com/alibaba/higress/releases/download/v${HIGRESS_VERSION}/higress-tinygo${TINYGO_VERSION}.linux-arm64.tar.gz"; \ - else \ - tinygo_url="https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo${TINYGO_VERSION}.linux-arm64.tar.gz"; \ - fi; \ oras_url="https://github.com/oras-project/oras/releases/download/v${ORAS_VERSION}/oras_${ORAS_VERSION}_linux_arm64.tar.gz"; \ ;; \ *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \ @@ -90,9 +27,6 @@ RUN set -e; \ echo "go_url: $go_url"; \ wget -O go.tgz "$go_url" --progress=dot:giga || (echo "Failed to download Go" && exit 1); \ tar -C /usr/local -xzf go.tgz && rm go.tgz; \ - echo "tinygo_url: $tinygo_url"; \ - wget -O tinygo.tgz "$tinygo_url" --progress=dot:giga || (echo "Failed to download TinyGo" && exit 1); \ - tar -C /usr/local -xzf tinygo.tgz && rm tinygo.tgz; \ echo "oras_url: $oras_url"; \ wget -O oras.tgz "$oras_url" --progress=dot:giga || (echo "Failed to download ORAS" && exit 1); \ tar -C /usr/local/bin -xzf oras.tgz && rm oras.tgz; \ diff --git a/plugins/wasm-go/Makefile b/plugins/wasm-go/Makefile index b9624544a..f2d3c37a8 100644 --- a/plugins/wasm-go/Makefile +++ b/plugins/wasm-go/Makefile @@ -1,7 +1,7 @@ PLUGIN_NAME ?= hello-world BUILDER_REGISTRY ?= higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/ REGISTRY ?= higress-registry.cn-hangzhou.cr.aliyuncs.com/plugins/ -GO_VERSION ?= 1.24.0 +GO_VERSION ?= 1.24.4 TINYGO_VERSION ?= 0.29.0 ORAS_VERSION ?= 1.0.0 HIGRESS_VERSION ?= 1.0.0-rc