From f4d15496172ffed60ff45f9c99f7dd429e982d23 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 9 Jul 2024 14:15:19 +0800 Subject: [PATCH] chore: set docker syntax using erda registry --- Makefile | 2 +- build/dockerfiles/Dockerfile | 2 +- build/dockerfiles/Dockerfile-action-agent | 1 + build/dockerfiles/Dockerfile-cluster-ops | 2 +- build/dockerfiles/Dockerfile-volume-provisioner | 2 +- build/dockerfiles/agent-injector/Dockerfile | 2 +- build/dockerfiles/base/Dockerfile | 1 + build/dockerfiles/cli/Dockerfile | 2 +- build/dockerfiles/cluster-agent/Dockerfile | 2 +- build/dockerfiles/reportengine/Dockerfile | 2 +- build/scripts/buildkit_image.sh | 2 +- pipeline.yml | 10 +++++----- 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2109dacb568..87e0ca552b3 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ run-test: go run tools/gotools/go-test-sum/main.go full-test: - docker run --rm -ti -v $$(pwd):/go/src/output registry.erda.cloud/erda/erda-base:20240606 \ + docker run --rm -ti -v $$(pwd):/go/src/output registry.erda.cloud/erda/erda-base:20240607 \ bash -c 'cd /go/src/output && build/scripts/test_in_container.sh' # docker image diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index 9e39b287d7c..ecb2308629e 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:1.2 +# syntax = registry.erda.cloud/retag/dockerfile:latest ARG BASE_DOCKER_IMAGE FROM --platform=$TARGETPLATFORM ${BASE_DOCKER_IMAGE} as build diff --git a/build/dockerfiles/Dockerfile-action-agent b/build/dockerfiles/Dockerfile-action-agent index 65e940c3e3f..2adda53e25f 100644 --- a/build/dockerfiles/Dockerfile-action-agent +++ b/build/dockerfiles/Dockerfile-action-agent @@ -1,3 +1,4 @@ +# syntax = registry.erda.cloud/retag/dockerfile:latest ARG BASE_DOCKER_IMAGE FROM ${BASE_DOCKER_IMAGE} as build diff --git a/build/dockerfiles/Dockerfile-cluster-ops b/build/dockerfiles/Dockerfile-cluster-ops index 898c75f64ec..9884174b05e 100644 --- a/build/dockerfiles/Dockerfile-cluster-ops +++ b/build/dockerfiles/Dockerfile-cluster-ops @@ -1,6 +1,6 @@ ### This Dockerfile not used yet @iutx -# syntax = docker/dockerfile:1.2 +# syntax = registry.erda.cloud/retag/dockerfile:latest FROM registry.erda.cloud/erda/golang-base:210416 as build RUN mkdir -p "$GOPATH/src/github.com/erda-project/erda/" diff --git a/build/dockerfiles/Dockerfile-volume-provisioner b/build/dockerfiles/Dockerfile-volume-provisioner index 6fe438bda74..47772d9c9eb 100644 --- a/build/dockerfiles/Dockerfile-volume-provisioner +++ b/build/dockerfiles/Dockerfile-volume-provisioner @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:1.2 +# syntax = registry.erda.cloud/retag/dockerfile:latest ARG BASE_DOCKER_IMAGE FROM --platform=$TARGETPLATFORM ${BASE_DOCKER_IMAGE} as build diff --git a/build/dockerfiles/agent-injector/Dockerfile b/build/dockerfiles/agent-injector/Dockerfile index 33bc4720814..a8d703af4e1 100644 --- a/build/dockerfiles/agent-injector/Dockerfile +++ b/build/dockerfiles/agent-injector/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:1.2 +# syntax = registry.erda.cloud/retag/dockerfile:latest ARG BASE_DOCKER_IMAGE FROM ${BASE_DOCKER_IMAGE} as build diff --git a/build/dockerfiles/base/Dockerfile b/build/dockerfiles/base/Dockerfile index 924f0a744ca..38c85ef29a3 100644 --- a/build/dockerfiles/base/Dockerfile +++ b/build/dockerfiles/base/Dockerfile @@ -1,3 +1,4 @@ +# syntax = registry.erda.cloud/retag/dockerfile:latest FROM bitnami/git:latest AS git-from FROM --platform=$TARGETPLATFORM golang:1.22-bookworm diff --git a/build/dockerfiles/cli/Dockerfile b/build/dockerfiles/cli/Dockerfile index 61e966981c1..f4371202894 100644 --- a/build/dockerfiles/cli/Dockerfile +++ b/build/dockerfiles/cli/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:1.2 +# syntax = registry.erda.cloud/retag/dockerfile:latest ARG BASE_DOCKER_IMAGE FROM ${BASE_DOCKER_IMAGE} as build diff --git a/build/dockerfiles/cluster-agent/Dockerfile b/build/dockerfiles/cluster-agent/Dockerfile index d6e6d7f747c..a51f39b92e8 100644 --- a/build/dockerfiles/cluster-agent/Dockerfile +++ b/build/dockerfiles/cluster-agent/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:1.2 +# syntax = registry.erda.cloud/retag/dockerfile:latest ARG BASE_DOCKER_IMAGE FROM --platform=$TARGETPLATFORM ${BASE_DOCKER_IMAGE} as build diff --git a/build/dockerfiles/reportengine/Dockerfile b/build/dockerfiles/reportengine/Dockerfile index f9a9808bb98..400cf9ddb07 100644 --- a/build/dockerfiles/reportengine/Dockerfile +++ b/build/dockerfiles/reportengine/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile:1.2 +# syntax = registry.erda.cloud/retag/dockerfile:latest ARG BASE_DOCKER_IMAGE FROM ${BASE_DOCKER_IMAGE} as build diff --git a/build/scripts/buildkit_image.sh b/build/scripts/buildkit_image.sh index 62e979dc6f4..fd0a7c714c8 100755 --- a/build/scripts/buildkit_image.sh +++ b/build/scripts/buildkit_image.sh @@ -4,7 +4,7 @@ set -o errexit -o pipefail cd "$(git rev-parse --show-toplevel)" -BASE_DOCKER_IMAGE=registry.erda.cloud/erda/erda-base:20240606 +BASE_DOCKER_IMAGE=registry.erda.cloud/erda/erda-base:20240607 IMAGE_TAG="${IMAGE_TAG:-$(build/scripts/make-version.sh tag)}" DOCKERFILE=./build/dockerfiles diff --git a/pipeline.yml b/pipeline.yml index 791ccfc33d9..4b34133bbde 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -62,7 +62,7 @@ stages: - stage: - custom-script: alias: build-erda - image: registry.erda.cloud/erda-actions/custom-script:2.0 + image: registry.erda.cloud/erda-actions/custom-script:2.1 commands: - cd ${{ dirs.erda }} - mkdir -p extensions @@ -86,7 +86,7 @@ stages: timeout: 14400 - custom-script: alias: build-erda-cli - image: registry.erda.cloud/erda-actions/custom-script:2.0 + image: registry.erda.cloud/erda-actions/custom-script:2.1 commands: - cd ${{ dirs.erda }} - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }} @@ -105,7 +105,7 @@ stages: timeout: 7200 - custom-script: alias: build-cluster-agent - image: registry.erda.cloud/erda-actions/custom-script:2.0 + image: registry.erda.cloud/erda-actions/custom-script:2.1 commands: - cd ${{ dirs.erda }} - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }} @@ -122,7 +122,7 @@ stages: mem: 2048 - custom-script: alias: build-monitor-injector - image: registry.erda.cloud/erda-actions/custom-script:2.0 + image: registry.erda.cloud/erda-actions/custom-script:2.1 commands: - cd ${{ dirs.erda-java-extensions }} - mkdir -p /root/.m2 && cp maven-settings-template.xml /root/.m2/settings.xml @@ -135,7 +135,7 @@ stages: mem: 1024 - custom-script: alias: build-diagnotor-agent - image: registry.erda.cloud/erda-actions/custom-script:2.0 + image: registry.erda.cloud/erda-actions/custom-script:2.1 commands: - cd ${{ dirs.erda }} - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}