Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: set docker syntax using erda registry #6392

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions build/dockerfiles/Dockerfile-action-agent
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax = registry.erda.cloud/retag/dockerfile:latest
ARG BASE_DOCKER_IMAGE
FROM ${BASE_DOCKER_IMAGE} as build

Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/Dockerfile-cluster-ops
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/Dockerfile-volume-provisioner
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/agent-injector/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions build/dockerfiles/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/cluster-agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/reportengine/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/scripts/buildkit_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
Loading