Support custom Cardano Docker image registry in infra

input-output-hk · Dec 4, 2023 · 65ba690 · 65ba690
1 parent bdf0720
commit 65ba690
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 1 deletion.
diff --git a/mithril-infra/assets/docker/Dockerfile.cardano b/mithril-infra/assets/docker/Dockerfile.cardano
@@ -1,5 +1,6 @@
 ARG CARDANO_IMAGE_ID
-FROM inputoutput/cardano-node:$CARDANO_IMAGE_ID
+ARG CARDANO_IMAGE_REPOSITORY
+FROM $CARDANO_IMAGE_REPOSITORY:$CARDANO_IMAGE_ID
 
 # Fix env file rights
 # In order to be able to interact with the Cardano node trough its 'node.socket'

diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-auth-p2p.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-auth-p2p.yaml
@@ -10,6 +10,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml
@@ -10,6 +10,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-noauth-p2p.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-noauth-p2p.yaml
@@ -10,6 +10,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml b/mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml
@@ -10,6 +10,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml
@@ -12,6 +12,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified-p2p.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified-p2p.yaml
@@ -12,6 +12,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml b/mithril-infra/assets/docker/docker-compose-signer-unverified.yaml
@@ -12,6 +12,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-signer-verified-norelay.yaml b/mithril-infra/assets/docker/docker-compose-signer-verified-norelay.yaml
@@ -12,6 +12,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-signer-verified-p2p.yaml b/mithril-infra/assets/docker/docker-compose-signer-verified-p2p.yaml
@@ -12,6 +12,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/assets/docker/docker-compose-signer-verified.yaml b/mithril-infra/assets/docker/docker-compose-signer-verified.yaml
@@ -12,6 +12,7 @@ services:
       dockerfile: Dockerfile.cardano
       args:
         CARDANO_IMAGE_ID: ${CARDANO_IMAGE_ID}
+        CARDANO_IMAGE_REPOSITORY: ${CARDANO_IMAGE_REPOSITORY}
     user: ${CURRENT_UID}
     profiles:
       - cardano

diff --git a/mithril-infra/mithril.aggregator.tf b/mithril-infra/mithril.aggregator.tf
@@ -46,6 +46,7 @@ EOT
     inline = [
       "export NETWORK=${var.cardano_network}",
       "export CARDANO_IMAGE_ID=${var.cardano_image_id}",
+      "export CARDANO_IMAGE_REPOSITORY: ${var.cardano_image_repository}",
       "export MITHRIL_IMAGE_ID=${var.mithril_image_id}",
       "export AGGREGATOR_HOST=${local.mithril_aggregator_host}",
       "export GOOGLE_APPLICATION_CREDENTIALS_JSON='${local.google_cloud_storage_credentials_json}'",

diff --git a/mithril-infra/mithril.signer.tf b/mithril-infra/mithril.signer.tf
@@ -79,6 +79,7 @@ EOT
       "export PARTY_ID=${each.value.pool_id}",
       "export NETWORK=${var.cardano_network}",
       "export CARDANO_IMAGE_ID=${var.cardano_image_id}",
+      "export CARDANO_IMAGE_REPOSITORY: ${var.cardano_image_repository}",
       "export MITHRIL_IMAGE_ID=${var.mithril_image_id}",
       "export AGGREGATOR_CREDENTIALS=${local.mithril_aggregator_credentials}",
       "export SIGNER_HOST=${local.mithril_signers_host[each.key]}",

diff --git a/mithril-infra/variables.tf b/mithril-infra/variables.tf
@@ -144,6 +144,12 @@ variable "cardano_image_id" {
   default     = "8.1.2"
 }
 
+variable "cardano_image_repository" {
+  type        = string
+  description = "The Cardano image repository of service to deploy"
+  default     = "inputoutput/cardano-node"
+}
+
 variable "cardano_configurations_repository_commit" {
   type        = string
   description = "The Cardano configurations commit to use"