Skip to content

Commit d8a0940

Browse files
23caterpie23caterpie
authored
Merge pull request #48 from Kochava/remove-container-registry2
fix: remove container registry pushes
2 parents d96a1b8 + cf4cc87 commit d8a0940

File tree

4 files changed

+4
-104
lines changed

4 files changed

+4
-104
lines changed

‎.github/workflows/base_app_release.yml‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ on:
2222
ARTIFACT_REGISTRY_JSON_KEY:
2323
description: 'Key for publishing to Artifact Registry'
2424
required: false
25-
# Container Registry arguements
26-
CONTAINER_REGISTRY:
27-
description: 'Container Registry address to which to publish (leave blank to not publish)'
28-
required: false
29-
CONTAINER_REGISTRY_JSON_KEY:
30-
description: 'Key for publishing to Container Registry'
31-
required: false
3225

3326
jobs:
3427
push:
@@ -52,21 +45,13 @@ jobs:
5245
if: ${{ env.ARTIFACT_REGISTRY }}
5346
run: |
5447
echo "ARTIFACT_REGISTRY_IMAGE_NAME=${{ secrets.ARTIFACT_REGISTRY }}/${{ github.repository }}" >> $GITHUB_ENV
55-
# Make the docker fields for Container Registry if we're pushing to it.
56-
- name: Construct Container Registry fields
57-
env:
58-
CONTAINER_REGISTRY: ${{ secrets.CONTAINER_REGISTRY }}
59-
if: ${{ env.CONTAINER_REGISTRY }}
60-
run: |
61-
echo "CONTAINER_REGISTRY_IMAGE_NAME=${{ secrets.CONTAINER_REGISTRY }}/${{ steps.parse_repo_name.outputs.repo_name }}" >> $GITHUB_ENV
6248
# Create docker image meta data. Docker tags include the Git tag itself and the sematic version parsing of that tag if possible.
6349
- name: Docker release meta
6450
id: release
6551
uses: docker/metadata-action@v4
6652
with:
6753
images: |
6854
${{ env.ARTIFACT_REGISTRY_IMAGE_NAME }}
69-
${{ env.CONTAINER_REGISTRY_IMAGE_NAME }}
7055
flavor: |
7156
latest=false
7257
tags: |
@@ -82,16 +67,6 @@ jobs:
8267
registry: ${{ secrets.ARTIFACT_REGISTRY }}
8368
username: _json_key
8469
password: ${{ secrets.ARTIFACT_REGISTRY_JSON_KEY }}
85-
# Login to Container Registry if we're pushing to it.
86-
- name: Login to Container Registry
87-
env:
88-
CONTAINER_REGISTRY_JSON_KEY: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
89-
if: ${{ env.CONTAINER_REGISTRY_JSON_KEY }}
90-
uses: docker/login-action@v2
91-
with:
92-
registry: ${{ secrets.CONTAINER_REGISTRY }}
93-
username: _json_key
94-
password: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
9570
# Setup QEMU needed to build arm64 images.
9671
- name: Setup QEMU
9772
uses: docker/setup-qemu-action@v2
@@ -100,7 +75,7 @@ jobs:
10075
id: buildx
10176
uses: docker/setup-buildx-action@v2
10277
# Build and push the image.
103-
- name: Build and Push to Artifact Registry and Container Registry
78+
- name: Build and Push to Artifact Registry
10479
uses: docker/build-push-action@v3
10580
with:
10681
push: true

‎.github/workflows/go_app_release.yml‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ on:
2626
ARTIFACT_REGISTRY_JSON_KEY:
2727
description: 'Key for publishing to Artifact Registry'
2828
required: false
29-
# Container Registry arguements
30-
CONTAINER_REGISTRY:
31-
description: 'Container Registry address to which to publish (leave blank to not publish)'
32-
required: false
33-
CONTAINER_REGISTRY_JSON_KEY:
34-
description: 'Key for publishing to Container Registry'
35-
required: false
3629

3730
env:
3831
GOPRIVATE: ${{ inputs.GOPRIVATE }}
@@ -72,21 +65,13 @@ jobs:
7265
if: ${{ env.ARTIFACT_REGISTRY }}
7366
run: |
7467
echo "ARTIFACT_REGISTRY_IMAGE_NAME=${{ secrets.ARTIFACT_REGISTRY }}/${{ github.repository }}" >> $GITHUB_ENV
75-
# Make the docker fields for Container Registry if we're pushing to it.
76-
- name: Construct Container Registry fields
77-
env:
78-
CONTAINER_REGISTRY: ${{ secrets.CONTAINER_REGISTRY }}
79-
if: ${{ env.CONTAINER_REGISTRY }}
80-
run: |
81-
echo "CONTAINER_REGISTRY_IMAGE_NAME=${{ secrets.CONTAINER_REGISTRY }}/${{ steps.parse_repo_name.outputs.repo_name }}" >> $GITHUB_ENV
8268
# Create docker image meta data. Docker tags include the Git tag itself and the sematic version parsing of that tag if possible.
8369
- name: Docker release meta
8470
id: release
8571
uses: docker/metadata-action@v4
8672
with:
8773
images: |
8874
${{ env.ARTIFACT_REGISTRY_IMAGE_NAME }}
89-
${{ env.CONTAINER_REGISTRY_IMAGE_NAME }}
9075
flavor: |
9176
latest=false
9277
tags: |
@@ -102,16 +87,6 @@ jobs:
10287
registry: ${{ secrets.ARTIFACT_REGISTRY }}
10388
username: _json_key
10489
password: ${{ secrets.ARTIFACT_REGISTRY_JSON_KEY }}
105-
# Login to Container Registry if we're pushing to it.
106-
- name: Login to Container Registry
107-
env:
108-
CONTAINER_REGISTRY_JSON_KEY: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
109-
if: ${{ env.CONTAINER_REGISTRY_JSON_KEY }}
110-
uses: docker/login-action@v2
111-
with:
112-
registry: ${{ secrets.CONTAINER_REGISTRY }}
113-
username: _json_key
114-
password: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
11590
# Setup QEMU needed to build arm64 images.
11691
- name: Setup QEMU
11792
uses: docker/setup-qemu-action@v2
@@ -120,7 +95,7 @@ jobs:
12095
id: buildx
12196
uses: docker/setup-buildx-action@v2
12297
# Build and push the image.
123-
- name: Build and Push to Artifact Registry and Container Registry
98+
- name: Build and Push to Artifact Registry
12499
uses: docker/build-push-action@v3
125100
with:
126101
push: true

‎.github/workflows/gradle_jvm_app_release.yml‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ on:
2626
ARTIFACT_REGISTRY_JSON_KEY:
2727
description: 'Key for publishing to Artifact Registry'
2828
required: false
29-
# Container Registry arguements
30-
CONTAINER_REGISTRY:
31-
description: 'Container Registry address to which to publish (leave blank to not publish)'
32-
required: false
33-
CONTAINER_REGISTRY_JSON_KEY:
34-
description: 'Key for publishing to Container Registry'
35-
required: false
3629

3730
env:
3831
GOPRIVATE: ${{ inputs.GOPRIVATE }}
@@ -66,21 +59,13 @@ jobs:
6659
if: ${{ env.ARTIFACT_REGISTRY }}
6760
run: |
6861
echo "ARTIFACT_REGISTRY_IMAGE_NAME=${{ secrets.ARTIFACT_REGISTRY }}/${{ github.repository }}" >> $GITHUB_ENV
69-
# Make the docker fields for Container Registry if we're pushing to it.
70-
- name: Construct Container Registry fields
71-
env:
72-
CONTAINER_REGISTRY: ${{ secrets.CONTAINER_REGISTRY }}
73-
if: ${{ env.CONTAINER_REGISTRY }}
74-
run: |
75-
echo "CONTAINER_REGISTRY_IMAGE_NAME=${{ secrets.CONTAINER_REGISTRY }}/${{ steps.parse_repo_name.outputs.repo_name }}" >> $GITHUB_ENV
7662
# Create docker image meta data. Docker tags include the Git tag itself and the sematic version parsing of that tag if possible.
7763
- name: Docker release meta
7864
id: release
7965
uses: docker/metadata-action@v4
8066
with:
8167
images: |
8268
${{ env.ARTIFACT_REGISTRY_IMAGE_NAME }}
83-
${{ env.CONTAINER_REGISTRY_IMAGE_NAME }}
8469
flavor: |
8570
latest=false
8671
tags: |
@@ -96,16 +81,6 @@ jobs:
9681
registry: ${{ secrets.ARTIFACT_REGISTRY }}
9782
username: _json_key
9883
password: ${{ secrets.ARTIFACT_REGISTRY_JSON_KEY }}
99-
# Login to Container Registry if we're pushing to it.
100-
- name: Login to Container Registry
101-
env:
102-
CONTAINER_REGISTRY_JSON_KEY: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
103-
if: ${{ env.CONTAINER_REGISTRY_JSON_KEY }}
104-
uses: docker/login-action@v2
105-
with:
106-
registry: ${{ secrets.CONTAINER_REGISTRY }}
107-
username: _json_key
108-
password: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
10984
# Setup QEMU needed to build arm64 images.
11085
- name: Setup QEMU
11186
uses: docker/setup-qemu-action@v2
@@ -114,7 +89,7 @@ jobs:
11489
id: buildx
11590
uses: docker/setup-buildx-action@v2
11691
# Build and push the image.
117-
- name: Build and Push to Artifact Registry and Container Registry
92+
- name: Build and Push to Artifact Registry
11893
uses: docker/build-push-action@v3
11994
with:
12095
push: true

‎.github/workflows/ruby_app_release.yml‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ on:
1313
ARTIFACT_REGISTRY_JSON_KEY:
1414
description: 'Key for publishing to Artifact Registry'
1515
required: false
16-
# Container Registry arguments
17-
CONTAINER_REGISTRY:
18-
description: 'Container Registry address to which to publish (leave blank to not publish)'
19-
required: false
20-
CONTAINER_REGISTRY_JSON_KEY:
21-
description: 'Key for publishing to Container Registry'
22-
required: false
2316

2417
jobs:
2518
push:
@@ -42,21 +35,13 @@ jobs:
4235
if: ${{ env.ARTIFACT_REGISTRY }}
4336
run: |
4437
echo "ARTIFACT_REGISTRY_IMAGE_NAME=${{ secrets.ARTIFACT_REGISTRY }}/${{ github.repository }}" >> $GITHUB_ENV
45-
# Make the docker fields for Container Registry if we're pushing to it.
46-
- name: Construct Container Registry fields
47-
env:
48-
CONTAINER_REGISTRY: ${{ secrets.CONTAINER_REGISTRY }}
49-
if: ${{ env.CONTAINER_REGISTRY }}
50-
run: |
51-
echo "CONTAINER_REGISTRY_IMAGE_NAME=${{ secrets.CONTAINER_REGISTRY }}/${{ steps.parse_repo_name.outputs.repo_name }}" >> $GITHUB_ENV
5238
# Create docker image meta data. Docker tags include the Git tag itself and the sematic version parsing of that tag if possible.
5339
- name: Docker release meta
5440
id: release
5541
uses: docker/metadata-action@v4
5642
with:
5743
images: |
5844
${{ env.ARTIFACT_REGISTRY_IMAGE_NAME }}
59-
${{ env.CONTAINER_REGISTRY_IMAGE_NAME }}
6045
flavor: |
6146
latest=false
6247
tags: |
@@ -72,22 +57,12 @@ jobs:
7257
registry: ${{ secrets.ARTIFACT_REGISTRY }}
7358
username: _json_key
7459
password: ${{ secrets.ARTIFACT_REGISTRY_JSON_KEY }}
75-
# Login to Container Registry if we're pushing to it.
76-
- name: Login to Container Registry
77-
env:
78-
CONTAINER_REGISTRY_JSON_KEY: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
79-
if: ${{ env.CONTAINER_REGISTRY_JSON_KEY }}
80-
uses: docker/login-action@v2
81-
with:
82-
registry: ${{ secrets.CONTAINER_REGISTRY }}
83-
username: _json_key
84-
password: ${{ secrets.CONTAINER_REGISTRY_JSON_KEY }}
8560
# Setup Docker builder needed to build multi-architectural images.
8661
- name: Setup Docker Buildx
8762
id: buildx
8863
uses: docker/setup-buildx-action@v2
8964
# Build and push the image.
90-
- name: Build and Push to Artifact Registry and Container Registry
65+
- name: Build and Push to Artifact Registry
9166
uses: docker/build-push-action@v3
9267
with:
9368
push: true

0 commit comments

Comments
 (0)