diff options
| author | gy95 <1015105054@qq.com> | 2022-11-24 20:06:06 +0800 |
|---|---|---|
| committer | gy95 <1015105054@qq.com> | 2022-11-25 14:57:36 +0800 |
| commit | 3098cf4258351017d968f2ee63192d57269c54ca (patch) | |
| tree | 40b14cfe9082b13b20ed6f29790d25f2a0aeea90 /build/docker | |
| parent | Merge pull request #4432 from gy95/licence (diff) | |
| download | kubeedge-3098cf4258351017d968f2ee63192d57269c54ca.tar.gz | |
add CI about building build-tools image
Signed-off-by: gy95 <1015105054@qq.com>
Diffstat (limited to 'build/docker')
| -rw-r--r-- | build/docker/build-tools/build-tools.dockerfile | 6 | ||||
| -rwxr-xr-x | build/docker/build-tools/make-build-tools.sh | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/build/docker/build-tools/build-tools.dockerfile b/build/docker/build-tools/build-tools.dockerfile index b009f84d5..d4a5baa71 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.17.linux-amd64.tar.gz -O - | tar -xz -C /usr/local; \ - elif [ "${ARCH}" = "arm64" ]; then wget -c https://dl.google.com/go/go1.17.linux-arm64.tar.gz -O - | tar -xz -C /usr/local; \ - elif [ "${ARCH}" = "arm" ]; then wget -c https://dl.google.com/go/go1.17.linux-armv6l.tar.gz -O - | tar -xz -C /usr/local; \ +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; \ 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 e671ed033..632a783a7 100755 --- a/build/docker/build-tools/make-build-tools.sh +++ b/build/docker/build-tools/make-build-tools.sh @@ -3,6 +3,10 @@ set -e 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"} WORK_DIR=$(cd "$(dirname "$0")";pwd) PUSH_TAG=${1} ARCHS=(amd64 arm64 arm) @@ -12,26 +16,26 @@ for arch in "${ARCHS[@]}" ; do if [ "$arch" = "amd64" ]; then REPOSITORY_ARCH="$REPOSITORY" fi - docker buildx build --build-arg ARCH="$arch" --platform "$arch" -t "$REPOSITORY_ARCH":latest -f "$WORK_DIR/build-tools.dockerfile" -o type=docker . + docker buildx build --build-arg ARCH="$arch" --platform "$arch" -t "$REPOSITORY_ARCH":"$IMAGE_TAG" -f "$WORK_DIR/build-tools.dockerfile" -o type=docker . done if [ "$PUSH_TAG" = 'push' ]; then echo "push edgecore image" - manifestCreateCmd="docker manifest create $REPOSITORY:latest" + manifestCreateCmd="docker manifest create $REPOSITORY:$IMAGE_TAG" for arch in "${ARCHS[@]}" ; do REPOSITORY_ARCH="$REPOSITORY"-"$arch" if [ "$arch" = "amd64" ]; then REPOSITORY_ARCH="$REPOSITORY" fi - docker push "$REPOSITORY_ARCH":latest - manifestCreateCmd="$manifestCreateCmd $REPOSITORY_ARCH:latest" + docker push "$REPOSITORY_ARCH":"$IMAGE_TAG" + manifestCreateCmd="$manifestCreateCmd $REPOSITORY_ARCH:$IMAGE_TAG" done echo "package image manifest and push" echo "command: $manifestCreateCmd" doCreate="$($manifestCreateCmd)" echo "$doCreate" - docker manifest push --purge "$REPOSITORY":latest + docker manifest push --purge "$REPOSITORY":"$IMAGE_TAG" else echo "image save in local" fi |