From 09c0732e95d9a4fdd399da7d04eedbd2c4e55afb Mon Sep 17 00:00:00 2001
From: Hannes Voigt-Georg <hannes.georg@freiheit.com>
Date: Wed, 3 Nov 2021 21:02:58 +0100
Subject: [PATCH] Fix ghcr container names (#18)

---
 chart/values.yaml.tpl                | 5 +++--
 docker/build/Dockerfile              | 1 +
 services/cd-service/Dockerfile       | 1 +
 services/cd-service/Makefile         | 2 +-
 services/frontend-service/Dockerfile | 1 +
 services/frontend-service/Makefile   | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/chart/values.yaml.tpl b/chart/values.yaml.tpl
index 55fbd503f..29381be7c 100644
--- a/chart/values.yaml.tpl
+++ b/chart/values.yaml.tpl
@@ -8,17 +8,18 @@ git:
 
 hub: ghcr.io/freiheit-com
 tag: "$VERSION"
+
 log:
   # Possible values are "gcp" for a gcp-optimized format and "default" for json
   format: ""
   # Other possible values are "DEBUG", "INFO", "ERROR"
   level: "WARN"
 cd:
-  image: kuberpult/cd-service
+  image: kuberpult-cd-service
   backendConfig:
     create: false # Add backend config for health checks on GKE only
 frontend:
-  image: kuberpult/frontend-service
+  image: kuberpult-frontend-service
 ingress:
   annotations: {}
   domainName: null
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index 38a5564f5..35a6c1434 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -1,3 +1,4 @@
 FROM alpine:3.14
+LABEL org.opencontainers.image.source https://github.com/freiheit-com/kuberpult
 RUN apk add --no-cache libgit2 libgit2-dev go protoc make pkgconfig git
 RUN wget https://github.com/argoproj/argo-cd/releases/download/v2.1.2/argocd-linux-amd64 -O /usr/local/bin/argocd && chmod +x /usr/local/bin/argocd
diff --git a/services/cd-service/Dockerfile b/services/cd-service/Dockerfile
index be5a56160..66174cc4c 100644
--- a/services/cd-service/Dockerfile
+++ b/services/cd-service/Dockerfile
@@ -1,4 +1,5 @@
 FROM alpine:3.14
+LABEL org.opencontainers.image.source https://github.com/freiheit-com/kuberpult
 RUN apk --update add ca-certificates tzdata libgit2 git
 RUN wget https://github.com/argoproj/argo-cd/releases/download/v2.1.2/argocd-linux-amd64 -O /usr/local/bin/argocd && chmod +x /usr/local/bin/argocd
 ENV TZ=Europe/Berlin
diff --git a/services/cd-service/Makefile b/services/cd-service/Makefile
index 5bf528598..9c8311fa6 100644
--- a/services/cd-service/Makefile
+++ b/services/cd-service/Makefile
@@ -22,7 +22,7 @@ export VERSION
 
 export CGO_ENABLED=1
 
-IMAGENAME?=ghcr.io/freiheit-com/kuberpult/cd-service:${VERSION}
+IMAGENAME?=ghcr.io/freiheit-com/kuberpult-cd-service:${VERSION}
 
 COMPILE_WITH_DOCKER := $(shell [ -z "$$WITHOUT_DOCKER" ] && v=true || v=false; echo $$v)
 
diff --git a/services/frontend-service/Dockerfile b/services/frontend-service/Dockerfile
index cd0b2a162..7100f6245 100644
--- a/services/frontend-service/Dockerfile
+++ b/services/frontend-service/Dockerfile
@@ -2,6 +2,7 @@ FROM alpine:3.14 AS builder
 RUN apk --update add ca-certificates tzdata
 
 FROM scratch
+LABEL org.opencontainers.image.source https://github.com/freiheit-com/kuberpult
 ENV TZ=Europe/Berlin
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
diff --git a/services/frontend-service/Makefile b/services/frontend-service/Makefile
index ffb771004..c11a56291 100644
--- a/services/frontend-service/Makefile
+++ b/services/frontend-service/Makefile
@@ -26,7 +26,7 @@ GO := go
 GO_FILES := $(shell find . -type f -name '*.go')
 
 
-IMAGENAME?=ghcr.io/freiheit-com/kuberpult/frontend-service:${VERSION}
+IMAGENAME?=ghcr.io/freiheit-com/kuberpult-frontend-service:${VERSION}
 
 GARBAGE := *.sentinel