Merge pull request #2 from codecentric/122-use-github-docker-images

Switch container references from Dockerhub to GHCR
codecentric · Mar 25, 2022 · a1b7e6d · a1b7e6d
2 parents 19b9ffb + 0ade3e4
commit a1b7e6d
Show file tree

Hide file tree

Showing 17 changed files with 158 additions and 158 deletions.
diff --git a/infrastructure/docker/docker-compose.yml b/infrastructure/docker/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     networks:
       - habitcentric-net
   gateway:
-    image: habitcentric/gateway
+    image: ghcr.io/codecentric/habitcentric/gateway
     environment:
       AUTH_TYPE: OAUTH_2_LOGIN
       AUTH_URI: http://habitcentric.demo:8080
@@ -51,7 +51,7 @@ services:
     networks:
       - habitcentric-net
   habit:
-    image: habitcentric/habit
+    image: ghcr.io/codecentric/habitcentric/habit
     depends_on:
       - habit-db
     environment:
@@ -67,7 +67,7 @@ services:
     networks:
       - habitcentric-net
   track:
-    image: habitcentric/track
+    image: ghcr.io/codecentric/habitcentric/track
     depends_on:
       - track-db
     environment:
@@ -83,14 +83,14 @@ services:
     networks:
       - habitcentric-net
   report:
-    image: habitcentric/report
+    image: ghcr.io/codecentric/habitcentric/report
     environment:
       HABIT_SERVICE_URL: http://habit:9001
       TRACK_SERVICE_URL: http://track:9002
     networks:
       - habitcentric-net
   ui:
-    image: habitcentric/ui
+    image: ghcr.io/codecentric/habitcentric/ui
     environment:
       HABIT_SERVICE_HOST: http://localhost:9000/
       TRACKING_SERVICE_HOST: http://localhost:9000/

diff --git a/infrastructure/kubernetes/helmfile.d/values/gateway-values.yaml.gotmpl b/infrastructure/kubernetes/helmfile.d/values/gateway-values.yaml.gotmpl
@@ -1,8 +1,8 @@
 fullnameOverride: gateway
 
 image:
-  registry: docker.io
-  repository: habitcentric/gateway
+  registry: ghcr.io
+  repository: codecentric/habitcentric/gateway
   tag: latest
   pullPolicy: Always
 

diff --git a/infrastructure/kubernetes/helmfile.d/values/habit-values.yaml.gotmpl b/infrastructure/kubernetes/helmfile.d/values/habit-values.yaml.gotmpl
@@ -8,8 +8,8 @@ init:
     pullPolicy: IfNotPresent
 
 image:
-  registry: docker.io
-  repository: habitcentric/habit
+  registry: ghcr.io
+  repository: codecentric/habitcentric/habit
   tag: latest
   ## Specifies a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/infrastructure/kubernetes/helmfile.d/values/report-values.yaml.gotmpl b/infrastructure/kubernetes/helmfile.d/values/report-values.yaml.gotmpl
@@ -14,8 +14,8 @@ stable:
   {{- end }}
 
   image:
-    registry: docker.io
-    repository: habitcentric/report
+    registry: ghcr.io
+    repository: codecentric/habitcentric/report
     tag: latest
     ## Specifies an imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -52,8 +52,8 @@ canary:
   {{- end }}
 
   image:
-    registry: docker.io
-    repository: habitcentric/report
+    registry: ghcr.io
+    repository: codecentric/habitcentric/report
     tag: latest
     ## Specifies an imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/infrastructure/kubernetes/helmfile.d/values/track-values.yaml.gotmpl b/infrastructure/kubernetes/helmfile.d/values/track-values.yaml.gotmpl
@@ -8,8 +8,8 @@ init:
     pullPolicy: IfNotPresent
 
 image:
-  registry: docker.io
-  repository: habitcentric/track
+  registry: ghcr.io
+  repository: codecentric/habitcentric/track
   tag: latest
   ## Specifies a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/infrastructure/kubernetes/helmfile.d/values/ui-values.yaml.gotmpl b/infrastructure/kubernetes/helmfile.d/values/ui-values.yaml.gotmpl
@@ -1,7 +1,7 @@
 fullnameOverride: ui
 image:
-  registry: docker.io
-  repository: habitcentric/ui
+  registry: ghcr.io
+  repository: codecentric/habitcentric/ui
   tag: latest
   ## Specifies a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/services/gateway/docker-compose.yml b/services/gateway/docker-compose.yml
@@ -51,7 +51,7 @@ services:
     networks:
       - habitcentric-net
   habit:
-    image: habitcentric/habit
+    image: ghcr.io/codecentric/habitcentric/habit
     depends_on:
       - habit-db
     environment:
@@ -67,7 +67,7 @@ services:
     networks:
       - habitcentric-net
   track:
-    image: habitcentric/track
+    image: ghcr.io/codecentric/habitcentric/track
     depends_on:
       - track-db
     environment:
@@ -83,14 +83,14 @@ services:
     networks:
       - habitcentric-net
   report:
-    image: habitcentric/report
+    image: ghcr.io/codecentric/habitcentric/report
     environment:
       HABIT_SERVICE_URL: http://habit:9001
       TRACK_SERVICE_URL: http://track:9002
     networks:
       - habitcentric-net
   ui:
-    image: habitcentric/ui
+    image: ghcr.io/codecentric/habitcentric/ui
     environment:
       HABIT_SERVICE_HOST: http://localhost:9000/
       TRACKING_SERVICE_HOST: http://localhost:9000/

diff --git a/services/gateway/helm/gateway/README.md b/services/gateway/helm/gateway/README.md
@@ -51,8 +51,8 @@ default values.
 |--------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------|
 | `appVersionOverride`                 | Overrides value of `app.kubernetes.io/version` label                                                                                      | `nil`                               |
 | `global.imageRegistry`               | Global Docker image registry                                                                                                              | `nil`                               |
-| `image.registry`                     | habitcentric gateway image registry                                                                                                       | `docker.io`                         |
-| `image.repository`                   | habitcentric gateway image name                                                                                                           | `habitcentric/gateway`              |
+| `image.registry`                     | habitcentric gateway image registry                                                                                                       | `ghcr.io`                           |
+| `image.repository`                   | habitcentric gateway image name                                                                                                           | `codecentric/habitcentric/gateway`  |
 | `image.tag`                          | habitcentric gateway image tag                                                                                                            | `latest`                            |
 | `image.pullPolicy`                   | habitcentric gateway pull policy                                                                                                          | `Always`                            |
 | `service.type`                       | The service type                                                                                                                          | `NodePort`                          |

diff --git a/services/gateway/helm/gateway/values.yaml b/services/gateway/helm/gateway/values.yaml
@@ -1,8 +1,8 @@
 # appVersionOverride:
 
 image:
-  registry: docker.io
-  repository: habitcentric/gateway
+  registry: ghcr.io
+  repository: codecentric/habitcentric/gateway
   tag: latest
   ## Specifies an imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'