Skip to content

Commit 6dbcc00

Browse files
committed
fix: deprecate GCR repo
1 parent 53efbe3 commit 6dbcc00

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

references/cicd-pipeline/jenkins-build/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ docker build -f ./jenkins-web/Dockerfile -t apigee/devrel-jenkins:latest .
4040
PROJECT_ID=<my-project>
4141
gcloud builds submit --config ./cloudbuild.yml --project $PROJECT_ID
4242
gcloud builds submit --config ./jenkins-web/cloudbuild.yml --project $PROJECT_ID
43-
docker pull gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest
44-
docker tag gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest apigee/devrel-jenkins:latest
43+
docker pull europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest
44+
docker tag europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest apigee/devrel-jenkins:latest
4545
```
4646

4747
### Run the Jenkins Container
@@ -56,8 +56,8 @@ Image in GCR. If you have not used Cloud Build to build your Image then push it
5656
to GCR like so:
5757

5858
```sh
59-
docker tag apigee/devrel-jenkins:latest gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest
60-
docker push gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest
59+
docker tag apigee/devrel-jenkins:latest europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest
60+
docker push europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest
6161
```
6262

6363
If you are building for Apigee X or hybrid you should create a dedicated service
@@ -108,7 +108,7 @@ CONTAINER_ENVS+=",APIGEE_PROD_ENV=prod1"
108108
CONTAINER_ENVS+=",TEST_HOST=$APIGEE_X_HOSTNAME"
109109

110110
gcloud compute instances create-with-container jenkins --tags jenkins \
111-
--container-image gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest \
111+
--container-image europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest \
112112
--container-env "$CONTAINER_ENVS" \
113113
--machine-type e2-standard-2 \
114114
--service-account "$JENKINS_SA_EMAIL" \
@@ -134,7 +134,7 @@ CONTAINER_ENVS+=",APIGEE_PASS=$APIGEE_PASS"
134134
CONTAINER_ENVS+=",TEST_HOST=$APIGEE_ORG-$APIGEE_ENV.apigee.net"
135135

136136
gcloud compute instances create-with-container jenkins --tags jenkins \
137-
--container-image gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest \
137+
--container-image europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest \
138138
--container-env "$CONTAINER_ENVS" \
139139
--machine-type e2-standard-2 \
140140
--service-account "$JENKINS_SA_EMAIL" --scopes cloud-platform
@@ -233,8 +233,8 @@ docker build -f jenkinsfile-runner/Dockerfile -t apigee/devrel-jenkinsfile:lates
233233
PROJECT_ID=$(gcloud config get-value project)\
234234
gcloud builds submit --config ./cloudbuild.yml --project $PROJECT_ID
235235
gcloud builds submit --config ./jenkinsfile-runner/cloudbuild.yml --project $PROJECT_ID
236-
docker pull gcr.io/$PROJECT_ID/apigee/devrel-jenkinsfile-runner:latest
237-
docker tag gcr.io/$PROJECT_ID/apigee/devrel-jenkinsfile-runner:latest apigee/devrel-jenkinsfile:latest
236+
docker pull europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkinsfile-runner:latest
237+
docker tag europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkinsfile-runner:latest apigee/devrel-jenkinsfile:latest
238238
```
239239

240240
### Example Run

references/cicd-pipeline/jenkins-build/cloudbuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ steps:
1616
- name: "gcr.io/cloud-builders/docker"
1717
args:
1818
- build
19-
- "--tag=gcr.io/$PROJECT_ID/apigee/devrel-jenkins-base:latest"
19+
- "--tag=europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins-base:latest"
2020
- "--file=./Dockerfile"
2121
- .
2222
images:
23-
- "gcr.io/$PROJECT_ID/apigee/devrel-jenkins-base:latest"
23+
- "europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins-base:latest"

references/cicd-pipeline/jenkins-build/jenkins-web/cloudbuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ steps:
1616
- name: "gcr.io/cloud-builders/docker"
1717
args:
1818
- build
19-
- "--tag=gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest"
19+
- "--tag=europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest"
2020
- "--file=./jenkins-web/Dockerfile"
21-
- "--build-arg=baseImage=gcr.io/$PROJECT_ID/apigee/devrel-jenkins-base"
21+
- "--build-arg=baseImage=europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins-base"
2222
- "--build-arg=baseImageTag=latest"
2323
- .
2424
images:
25-
- "gcr.io/$PROJECT_ID/apigee/devrel-jenkins:latest"
25+
- "europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins:latest"

references/cicd-pipeline/jenkins-build/jenkinsfile-runner/cloudbuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ steps:
1616
- name: "gcr.io/cloud-builders/docker"
1717
args:
1818
- build
19-
- "--tag=gcr.io/$PROJECT_ID/apigee/devrel-jenkinsfile-runner:latest"
19+
- "--tag=europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkinsfile-runner:latest"
2020
- "--file=./jenkinsfile-runner/Dockerfile"
21-
- "--build-arg=baseImage=gcr.io/$PROJECT_ID/apigee/devrel-jenkins-base"
21+
- "--build-arg=baseImage=europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkins-base"
2222
- "--build-arg=baseImageTag=latest"
2323
- .
2424
images:
25-
- "gcr.io/$PROJECT_ID/apigee/devrel-jenkinsfile-runner:latest"
25+
- "europe-docker.pkg.dev/$PROJECT_ID/devrel/devrel-jenkinsfile-runner:latest"

references/cloud-run/pipeline.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ SCRIPTPATH="$( cd "$(dirname "$0")" || exit >/dev/null 2>&1 ; pwd -P )"
1919
export PATH="$PATH:$SCRIPTPATH/../../tools/apigee-sackmesser/bin"
2020

2121
PROJECT_ID=$(gcloud config get-value project)
22-
gcloud builds submit --tag "gcr.io/$PROJECT_ID/apigee-target" --project "$PROJECT_ID"
22+
gcloud builds submit --tag "europe-docker.pkg.dev/$PROJECT_ID/devrel/apigee-target:latest" --project "$PROJECT_ID"
2323

2424
gcloud run deploy apigee-target-demo \
25-
--image="gcr.io/$(gcloud config get-value project)/apigee-target" \
25+
--image="europe-docker.pkg.dev/$PROJECT_ID/devrel/apigee-target:latest" \
2626
--platform=managed \
2727
--region=europe-west1 \
2828
--no-allow-unauthenticated --project "$PROJECT_ID"

0 commit comments

Comments
 (0)