diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-08-22 17:11:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-22 17:11:34 +0800 |
| commit | 8f28afdffcb5120f21a338fd94b2cd4727c2b51d (patch) | |
| tree | 31c92f0ed026dfd2b7ee761e99a6b74720bcd182 /build | |
| parent | Merge pull request #4938 from Shelley-BaoYue/bump-go1.19 (diff) | |
| parent | revert build tool ubuntu version 18.04 (diff) | |
| download | kubeedge-8f28afdffcb5120f21a338fd94b2cd4727c2b51d.tar.gz | |
Merge pull request #4950 from Shelley-BaoYue/bump-go1.19
revert build tool ubuntu version to 18.04
Diffstat (limited to 'build')
| -rw-r--r-- | build/docker/build-tools/build-tools.dockerfile | 2 | ||||
| -rwxr-xr-x | build/docker/build-tools/make-build-tools.sh | 2 | ||||
| -rw-r--r-- | build/docker/installation-package/installation-package.dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build/docker/build-tools/build-tools.dockerfile b/build/docker/build-tools/build-tools.dockerfile index 518671853..e769ff848 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:22.04 +FROM ubuntu:18.04 ARG ARCH=amd64 RUN apt-get update && apt-get install -y wget \ vim git make gcc upx-ucl diff --git a/build/docker/build-tools/make-build-tools.sh b/build/docker/build-tools/make-build-tools.sh index 5e3fe4246..71656b22f 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-ke1"} +IMAGE_TAG=${IMAGE_TAG:-"1.19.12-ke2"} WORK_DIR=$(cd "$(dirname "$0")";pwd) PUSH_TAG=${1} ARCHS=(amd64 arm64 arm) diff --git a/build/docker/installation-package/installation-package.dockerfile b/build/docker/installation-package/installation-package.dockerfile index 4e10f31e1..fa74e35d5 100644 --- a/build/docker/installation-package/installation-package.dockerfile +++ b/build/docker/installation-package/installation-package.dockerfile @@ -5,7 +5,7 @@ RUN mkdir -p bin && \ make WHAT=edgecore BUILD_WITH_CONTAINER=false && cp _output/local/bin/edgecore bin/edgecore && \ make WHAT=keadm BUILD_WITH_CONTAINER=false && cp _output/local/bin/keadm bin/keadm -FROM ubuntu:22.04 +FROM ubuntu:18.04 COPY --from=builder /work/_output/local/bin/edgecore /usr/local/bin/edgecore COPY --from=builder /work/_output/local/bin/keadm /usr/local/bin/keadm |