Skip to content

Commit 216b497

Browse files
committed
Remove explicit Docker tag and label for "catnip" image
* we want to use the "latest" tag just as for the existing public Docker app image
1 parent 61d6a73 commit 216b497

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

.github/workflows/build-catnip-docker-image.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,10 @@ jobs:
2525
registry: ${{ env.REGISTRY }}
2626
username: ${{ github.actor }}
2727
password: ${{ secrets.GITHUB_TOKEN }}
28-
- name: Extract metadata (tags, labels) for Docker
29-
id: meta
30-
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
31-
with:
32-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
3328
- name: Build and push Docker image
3429
id: push
3530
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
3631
with:
3732
context: ./assets/catnip/
3833
file: ./assets/catnip/Dockerfile
3934
push: true
40-
tags: ${{ steps.meta.outputs.tags }}
41-
labels: ${{ steps.meta.outputs.labels }}

helpers/config/config_struct.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ func getDefaults() config {
242242
defaults.PrivateDockerRegistryPassword = ptrToString("")
243243
defaults.PublicDockerAppImage = ptrToString("cloudfoundry/diego-docker-app:latest")
244244
// TODO use "latest" tag (?)
245-
defaults.CatnipDockerAppImage = ptrToString("ghcr.io/cloudfoundry/catnip-app:file-based-service-bindings-docker-app")
245+
defaults.CatnipDockerAppImage = ptrToString("ghcr.io/cloudfoundry/catnip-app:latest")
246246

247247
defaults.UnallocatedIPForSecurityGroup = ptrToString("10.0.244.255")
248248

@@ -298,7 +298,6 @@ func validateConfig(config *config) error {
298298
err = validateCatnipDockerAppImage(config)
299299
if err != nil {
300300
errs = errors.Join(errs, err)
301-
302301
}
303302

304303
err = validatePrivateDockerRegistry(config)

0 commit comments

Comments
 (0)