diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-08-21 20:33:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 20:33:18 +0800 |
| commit | 5621eb6962de2578fd7acc117b9889ae66a6e67a (patch) | |
| tree | 78bf798e9a22568d46077265e1eb983a46f398d8 /build | |
| parent | Merge pull request #4934 from cl2017/apply_reviewer (diff) | |
| parent | update golang version in build tool (diff) | |
| download | kubeedge-5621eb6962de2578fd7acc117b9889ae66a6e67a.tar.gz | |
Merge pull request #4947 from Shelley-BaoYue/bump-go1.19-buildtool
update golang version 1.19.12 for build tool
Diffstat (limited to 'build')
| -rw-r--r-- | build/docker/build-tools/build-tools.dockerfile | 8 | ||||
| -rwxr-xr-x | build/docker/build-tools/make-build-tools.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/docker/build-tools/build-tools.dockerfile b/build/docker/build-tools/build-tools.dockerfile index d4a5baa71..518671853 100644 --- a/build/docker/build-tools/build-tools.dockerfile +++ b/build/docker/build-tools/build-tools.dockerfile @@ -1,5 +1,5 @@ # As a basic image for building various components of KubeEdge -FROM ubuntu:18.04 +FROM ubuntu:22.04 ARG ARCH=amd64 RUN apt-get update && apt-get install -y wget \ vim git make gcc upx-ucl @@ -10,9 +10,9 @@ RUN apt-get autoremove -y &&\ apt-get clean &&\ rm -rf /var/lib/apt/lists/* -RUN if [ "${ARCH}" = "amd64" ]; then wget -c https://dl.google.com/go/go1.17.13.linux-amd64.tar.gz -O - | tar -xz -C /usr/local; \ - elif [ "${ARCH}" = "arm64" ]; then wget -c https://dl.google.com/go/go1.17.13.linux-arm64.tar.gz -O - | tar -xz -C /usr/local; \ - elif [ "${ARCH}" = "arm" ]; then wget -c https://dl.google.com/go/go1.17.13.linux-armv6l.tar.gz -O - | tar -xz -C /usr/local; \ +RUN if [ "${ARCH}" = "amd64" ]; then wget -c https://dl.google.com/go/go1.19.12.linux-amd64.tar.gz -O - | tar -xz -C /usr/local; \ + elif [ "${ARCH}" = "arm64" ]; then wget -c https://dl.google.com/go/go1.19.12.linux-arm64.tar.gz -O - | tar -xz -C /usr/local; \ + elif [ "${ARCH}" = "arm" ]; then wget -c https://dl.google.com/go/go1.19.12.linux-armv6l.tar.gz -O - | tar -xz -C /usr/local; \ fi ENV GO111MODULE=on diff --git a/build/docker/build-tools/make-build-tools.sh b/build/docker/build-tools/make-build-tools.sh index 632a783a7..5e3fe4246 100755 --- a/build/docker/build-tools/make-build-tools.sh +++ b/build/docker/build-tools/make-build-tools.sh @@ -6,7 +6,7 @@ REPOSITORY=${REPOSITORY:-"kubeedge/build-tools"} # image tag for build-tools image, including golang version and build-tools version # If there's some modifications for build-tools.dockerfile other than golang version, the build-tools version should be updated e.g. ke1, ke2. # If the golang version is updated in build-tools.dockerfile, the build-tools version should be started from ke1. -IMAGE_TAG=${IMAGE_TAG:-"1.17.13-ke1"} +IMAGE_TAG=${IMAGE_TAG:-"1.19.12-ke1"} WORK_DIR=$(cd "$(dirname "$0")";pwd) PUSH_TAG=${1} ARCHS=(amd64 arm64 arm) |