From 85d6260670735dff8c4cc5e8d2cfff40cdf73f3b Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Thu, 25 Sep 2025 11:24:14 +1000 Subject: [PATCH] feat: push uselagoon image to ghcr too --- Jenkinsfile | 5 ++++- Makefile | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5329540931..99b96e39d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,10 +255,13 @@ pipeline { } environment { PASSWORD = credentials('amazeeiojenkins-dockerhub-password') + GHCR_PASSWORD = credentials('amazeeio-github-bearer-token') } steps { sh script: 'docker login -u amazeeiojenkins -p $PASSWORD', label: "Docker login" - sh script: "make -O publish-uselagoon-images", label: "Publishing built images to uselagoon" + sh script: "make -O publish-uselagoon-images IMAGE_REPO=docker.io/uselagoon", label: "Publishing built images to uselagoon dockerhub" + sh script: 'docker login -u uselagoon-user -p $GHCR_PASSWORD ghcr.io', label: "GHCR login" + sh script: "make -O publish-uselagoon-images IMAGE_REPO=ghcr.io/uselagoon", label: "Publishing built images to uselagoon ghcr" } } stage ('scan built images') { diff --git a/Makefile b/Makefile index 79c0902caf..934a5e95c3 100644 --- a/Makefile +++ b/Makefile @@ -348,8 +348,8 @@ publish-testlagoon-images: .PHONY: publish-uselagoon-images publish-uselagoon-images: - PLATFORMS=$(PUBLISH_PLATFORM_ARCH) DATABASE_VENDOR=$(DATABASE_VENDOR) DATABASE_DOCKERFILE=$(DATABASE_DOCKERFILE) IMAGE_REPO=docker.io/uselagoon TAG=$(LAGOON_VERSION) LAGOON_VERSION=$(LAGOON_VERSION) docker buildx bake -f docker-bake.hcl --builder $(CI_BUILD_TAG) --push - PLATFORMS=$(PUBLISH_PLATFORM_ARCH) DATABASE_VENDOR=$(DATABASE_VENDOR) DATABASE_DOCKERFILE=$(DATABASE_DOCKERFILE) IMAGE_REPO=docker.io/uselagoon TAG=latest LAGOON_VERSION=$(LAGOON_VERSION) docker buildx bake -f docker-bake.hcl --builder $(CI_BUILD_TAG) --push + PLATFORMS=$(PUBLISH_PLATFORM_ARCH) DATABASE_VENDOR=$(DATABASE_VENDOR) DATABASE_DOCKERFILE=$(DATABASE_DOCKERFILE) TAG=$(LAGOON_VERSION) LAGOON_VERSION=$(LAGOON_VERSION) docker buildx bake -f docker-bake.hcl --builder $(CI_BUILD_TAG) --push + PLATFORMS=$(PUBLISH_PLATFORM_ARCH) DATABASE_VENDOR=$(DATABASE_VENDOR) DATABASE_DOCKERFILE=$(DATABASE_DOCKERFILE) TAG=latest LAGOON_VERSION=$(LAGOON_VERSION) docker buildx bake -f docker-bake.hcl --builder $(CI_BUILD_TAG) --push .PHONY: clean clean: