diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-10-30 10:08:27 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-10-30 10:08:27 +0800 |
| commit | f6446d061558049162a983854cbca9eba269c719 (patch) | |
| tree | aef01a8bbfed7cc68ecdc4aebad9664c17a76e5b /build | |
| parent | Merge pull request #5114 from Shelley-BaoYue/master (diff) | |
| download | kubeedge-f6446d061558049162a983854cbca9eba269c719.tar.gz | |
update go version to 1.20.10 for docker build tool
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/docker/build-tools/build-tools.dockerfile | 6 | ||||
| -rwxr-xr-x | build/docker/build-tools/make-build-tools.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/docker/build-tools/build-tools.dockerfile b/build/docker/build-tools/build-tools.dockerfile index e769ff848..5d76c72f8 100644 --- a/build/docker/build-tools/build-tools.dockerfile +++ b/build/docker/build-tools/build-tools.dockerfile @@ -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.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; \ +RUN if [ "${ARCH}" = "amd64" ]; then wget -c https://dl.google.com/go/go1.20.10.linux-amd64.tar.gz -O - | tar -xz -C /usr/local; \ + elif [ "${ARCH}" = "arm64" ]; then wget -c https://dl.google.com/go/go1.20.10.linux-arm64.tar.gz -O - | tar -xz -C /usr/local; \ + elif [ "${ARCH}" = "arm" ]; then wget -c https://dl.google.com/go/go1.20.10.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 71656b22f..408925e12 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.19.12-ke2"} +IMAGE_TAG=${IMAGE_TAG:-"1.20.10-ke1"} WORK_DIR=$(cd "$(dirname "$0")";pwd) PUSH_TAG=${1} ARCHS=(amd64 arm64 arm) |