Merge remote-tracking branch 'stage.ocelot.social/hetzner' into hetzner

IT4Change · Nov 5, 2024 · a126b9c · a126b9c
2 parents 9869f72 + a8a1311
commit a126b9c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/.env b/.env
@@ -1 +1 @@
-OCELOT_VERSION=sha-80ff4ef
+OCELOT_VERSION=sha-d120d82
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -32,6 +32,8 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Read $OCELOT_VERSION from file
+        run: cat .env >> $GITHUB_ENV
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@70b2cdc6480c1a8b86edf1777157f8f437de2166
@@ -45,8 +47,8 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=sha
-      - name: Read $OCELOT_VERSION from file
-        run: cat .env >> $GITHUB_ENV
+          labels: |
+            ocelot-version=${{ env.OCELOT_VERSION }}
       - name: Build and push Docker images
         id: push
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75

diff --git a/helmfile/environments/default.yaml.gotmpl b/helmfile/environments/default.yaml.gotmpl
@@ -1,7 +1,6 @@
-{{ $branded_image_tag:= env "BRANDED_IMAGE_TAG" | default (exec "../scripts/branded_image_tag.sh" (list) | trim) }}
-{{ $ocelot_image_tag := env "OCELOT_IMAGE_TAG" | default  (exec "../scripts/ocelot_image_tag.sh" (list) | trim) }}
+{{ $image_tag := env "IMAGE_TAG" | default  (exec "../scripts/image_tag.sh" (list) | trim) }}
 
 domain: staging.reformer-network.ocelot-social.roschaefer.de
 namespace: reformer-network-staging
-image_tag: {{ env "IMAGE_TAG" | default (printf "ocelot-%s--branded-%s" $ocelot_image_tag $branded_image_tag) }}
+image_tag: {{ $image_tag }}
 github_repository: it4change/reformer.network/backend
diff --git a/helmfile/helmfile.yaml.gotmpl b/helmfile/helmfile.yaml.gotmpl
@@ -22,7 +22,7 @@ releases:
 
   - name: ocelot-neo4j
     namespace: {{ .StateValues.namespace }}
-    chart: ocelot-social/ocelot-social
+    chart: ocelot-social/ocelot-neo4j
     values:
     - ./values/ocelot.yaml.gotmpl
     secrets:

diff --git a/helmfile/scripts/branded_image_tag.sh → helmfile/scripts/image_tag.sh b/helmfile/scripts/branded_image_tag.sh → helmfile/scripts/image_tag.sh
diff --git a/helmfile/scripts/ocelot_image_tag.sh b/helmfile/scripts/ocelot_image_tag.sh
diff --git a/helmfile/values/ocelot.yaml.gotmpl b/helmfile/values/ocelot.yaml.gotmpl
@@ -15,6 +15,7 @@ backend:
     repository:  ghcr.io/{{ .StateValues.github_repository | lower }}/backend
   storage: "10Gi"
   env:
+    NEO4J_URI: "bolt://ocelot-neo4j-neo4j:7687"
     PRODUCTION_DB_CLEAN_ALLOW: "true"
     PUBLIC_REGISTRATION: "true"
     INVITE_REGISTRATION: "true"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCELOT_VERSION=sha-80ff4ef
		OCELOT_VERSION=sha-d120d82