👷 Rename GHCR images (#1180)

* Rename GHCR images * Update target branch names in github actions (#1181) --------- Co-authored-by: Robbie Blaine <[email protected]>
didx-xyz · Nov 12, 2024 · 1385bfa · 1385bfa
1 parent 96560f1
commit 1385bfa
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 55 deletions.
diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
@@ -15,10 +15,10 @@ name: Codacy Security Scan
 
 on:
   push:
-    branches: [development, master]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [development]
+    branches: [master]
   schedule:
     - cron: "38 5 * * 3"
 

diff --git a/.github/workflows/continuous-deploy.yml b/.github/workflows/continuous-deploy.yml
@@ -21,12 +21,12 @@ on:
 
   push:
     branches:
-      - "development"
+      - "master"
     tags:
       - "v*"
   pull_request:
     branches:
-      - "development"
+      - "master"
     types:
       - opened
       - reopened
@@ -59,70 +59,70 @@ jobs:
       matrix:
         image:
           [
-            ledger-nodes,
-            ledger-browser,
-            tails-server,
-            governance-ga-agent,
-            governance-trust-registry,
-            governance-multitenant-web,
-            governance-ga-web,
-            governance-tenant-web,
-            governance-public-web,
-            governance-multitenant-agent,
-            governance-endorser,
-            pytest,
-            waypoint
+            d-cloud/ledger-nodes,
+            d-cloud/ledger-browser,
+            d-cloud/tails-server,
+            d-cloud/governance-agent,
+            d-cloud/trust-registry,
+            d-cloud/multitenant-web,
+            d-cloud/governance-web,
+            d-cloud/tenant-web,
+            d-cloud/public-web,
+            d-cloud/multitenant-agent,
+            d-cloud/endorser,
+            d-cloud/pytest,
+            d-cloud/waypoint
           ]
         include:
-          - image: governance-ga-agent
+          - image: d-cloud/governance-agent
             context: .
             file: dockerfiles/agents/Dockerfile.agent
             platforms: linux/amd64 # Pending BBS linux/arm64
-          - image: governance-trust-registry
+          - image: d-cloud/trust-registry
             context: .
             file: dockerfiles/trustregistry/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: governance-multitenant-web
+          - image: d-cloud/multitenant-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: governance-ga-web
+          - image: d-cloud/governance-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: governance-tenant-web
+          - image: d-cloud/tenant-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: governance-public-web
+          - image: d-cloud/public-web
             context: .
             file: dockerfiles/fastapi/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: governance-multitenant-agent
+          - image: d-cloud/multitenant-agent
             context: .
             file: dockerfiles/agents/Dockerfile.author.agent
             platforms: linux/amd64 # Pending BBS linux/arm64
-          - image: ledger-browser
+          - image: d-cloud/ledger-browser
             context: https://github.com/bcgov/von-network.git#v1.8.0
             file: Dockerfile
             platforms: linux/amd64
-          - image: ledger-nodes
+          - image: d-cloud/ledger-nodes
             context: https://github.com/bcgov/von-network.git#v1.8.0
             file: Dockerfile
             platforms: linux/amd64
-          - image: governance-endorser
+          - image: d-cloud/endorser
             context: .
             file: dockerfiles/endorser/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: tails-server
+          - image: d-cloud/tails-server
             context: https://github.com/bcgov/indy-tails-server.git#v1.1.0
             file: docker/Dockerfile.tails-server
             platforms: linux/amd64,linux/arm64
-          - image: pytest
+          - image: d-cloud/pytest
             context: .
             file: dockerfiles/tests/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: waypoint
+          - image: d-cloud/waypoint
             context: .
             file: dockerfiles/waypoint/Dockerfile
             platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -30,9 +30,9 @@ name: SonarCloud analysis
 
 on:
   push:
-    branches: [development, master]
+    branches: [master]
   pull_request:
-    branches: [development]
+    branches: [master]
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml
@@ -3,8 +3,7 @@ name: Python code style check
 on:
   pull_request:
     branches:
-      - main
-      - development
+      - master
 
 jobs:
   style:

diff --git a/docker-compose-ledger.yaml b/docker-compose-ledger.yaml
@@ -2,7 +2,7 @@
 
 services:
   ledger-browser:
-    image: ${REGISTRY:-ghcr.io/didx-xyz}/ledger-nodes:${IMAGE_TAG:-latest}
+    image: ${REGISTRY:-ghcr.io/didx-xyz}/d-cloud/ledger-nodes:${IMAGE_TAG:-latest}
     container_name: ledger-browser
     platform: linux/amd64
     command: "bash -c './scripts/start_webserver.sh'"
@@ -35,7 +35,7 @@ services:
       ledger-nodes:
         condition: service_healthy
   ledger-nodes:
-    image: ${REGISTRY:-ghcr.io/didx-xyz}/ledger-nodes:${IMAGE_TAG:-latest}
+    image: ${REGISTRY:-ghcr.io/didx-xyz}/d-cloud/ledger-nodes:${IMAGE_TAG:-latest}
     container_name: ledger-nodes
     platform: linux/amd64
     command: "bash -c './scripts/start_nodes.sh'"

diff --git a/tilt/cloudapi/Tiltfile b/tilt/cloudapi/Tiltfile
@@ -194,7 +194,7 @@ def build_cloudapi_service(service, image={}):
 
 
 def setup_cloudapi_service(
-    release, chart, namespace, ingress_domain, release_config={}, build_enabled=True
+    release, chart, namespace, ingress_domain, build_enabled, release_config={}
 ):
     print(color.green("Installing " + release + "..."))
 
@@ -251,7 +251,7 @@ def setup_cloudapi_service(
         print(color.yellow("Skipping " + release + ", not enabled"))
 
 
-def setup_ledger(namespace, ingress_domain, build_enabled=True):
+def setup_ledger(namespace, ingress_domain, build_enabled):
     print(color.green("Installing Ledger..."))
 
     # Setup Ledger Nodes
@@ -298,7 +298,7 @@ def setup_ledger(namespace, ingress_domain, build_enabled=True):
 
         if build_enabled:
             docker_build(
-                "ghcr.io/didx-xyz/ledger-nodes",
+                "ghcr.io/didx-xyz/d-cloud/ledger-nodes",
                 von_dir,
                 dockerfile=von_dir + "/Dockerfile",
                 platform="linux/amd64",
@@ -345,10 +345,10 @@ def setup_cloudapi(build_enabled, expose):
     setup_nats(namespace)
     setup_benthos(namespace)
 
-    ledger_enabled = setup_ledger(namespace, build_enabled)
+    ledger_enabled = setup_ledger(namespace, build_enabled, ingress_domain)
 
     releases = {
-        "governance-endorser": {
+        "endorser": {
             "depends": ["nats"],
             "image": {
                 "dockerfile": "./dockerfiles/endorser/Dockerfile",
@@ -361,7 +361,7 @@ def setup_cloudapi(build_enabled, expose):
                 ),
             },
         },
-        "governance-ga-agent": {
+        "governance-agent": {
             "depends": ["nats", "postgres", "ledger-browser"],
             "links": [
                 link(
@@ -373,8 +373,8 @@ def setup_cloudapi(build_enabled, expose):
                 "dockerfile": "./dockerfiles/agents/Dockerfile.agent",
             },
         },
-        "governance-ga-web": {
-            "depends": ["governance-ga-agent", "governance-multitenant-agent"],
+        "governance-web": {
+            "depends": ["governance-agent", "multitenant-agent"],
             "links": [
                 link(
                     "http://cloudapi." + ingress_domain + "/governance",
@@ -396,7 +396,7 @@ def setup_cloudapi(build_enabled, expose):
                 ),
             },
         },
-        "governance-multitenant-agent": {
+        "multitenant-agent": {
             "depends": ["nats", "postgres", "ledger-browser"],
             "links": [
                 link(
@@ -408,8 +408,8 @@ def setup_cloudapi(build_enabled, expose):
                 "dockerfile": "./dockerfiles/agents/Dockerfile.author.agent",
             },
         },
-        "governance-multitenant-web": {
-            "depends": ["governance-ga-agent", "governance-multitenant-agent"],
+        "multitenant-web": {
+            "depends": ["governance-agent", "multitenant-agent"],
             "links": [
                 link(
                     "http://cloudapi." + ingress_domain + "/tenant-admin",
@@ -431,8 +431,8 @@ def setup_cloudapi(build_enabled, expose):
                 ),
             },
         },
-        "governance-tenant-web": {
-            "depends": ["governance-ga-agent", "governance-multitenant-agent"],
+        "tenant-web": {
+            "depends": ["governance-agent", "multitenant-agent"],
             "links": [
                 link("http://cloudapi." + ingress_domain + "/tenant", "Tenant"),
                 link(
@@ -450,8 +450,8 @@ def setup_cloudapi(build_enabled, expose):
                 ),
             },
         },
-        "governance-trust-registry-web": {
-            "depends": ["governance-trust-registry"],
+        "public-web": {
+            "depends": ["trust-registry"],
             "links": [
                 link("http://cloudapi." + ingress_domain + "/public", "Public"),
                 link(
@@ -469,7 +469,7 @@ def setup_cloudapi(build_enabled, expose):
                 ),
             },
         },
-        "governance-trust-registry": {
+        "trust-registry": {
             "depends": ["postgres"],
             "links": [
                 link(
@@ -519,8 +519,8 @@ def setup_cloudapi(build_enabled, expose):
         "mediator": {
             "depends": [
                 "postgres",
-                "governance-ga-agent",
-                "governance-multitenant-agent",
+                "governance-agent",
+                "multitenant-agent",
             ],
             "links": [
                 link("http://mediator.cloudapi." + ingress_domain, "Mediator"),
@@ -539,8 +539,8 @@ def setup_cloudapi(build_enabled, expose):
             "./tilt/.charts/charts/aries-cloudapi-python",
             namespace,
             ingress_domain,
-            releases[release],
             build_enabled,
+            releases[release],
         )
 
     print(color.green("CloudAPI Installed"))