From d169df69bcc6e861c3c54e8874c45f93401be08f Mon Sep 17 00:00:00 2001
From: Christos Hadjiaslanis <christos.hadjiaslanis@linera.io>
Date: Wed, 6 Nov 2024 20:01:27 +0000
Subject: [PATCH] Parameterise docker compose image (#2829)

* Docker validator images are configurable.

* Updated deploy-validator.sh to a remote image.
---
 docker/docker-compose.yml   | 6 +++---
 scripts/deploy-validator.sh | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 39443b8e428..e01ab078945 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - "--overprovisioned"
       - "1"
   proxy:
-    image: linera
+    image: "${LINERA_IMAGE:-linera}"
     container_name: proxy
     ports:
       - "19100:19100"
@@ -23,7 +23,7 @@ services:
       shard-init:
         condition: service_completed_successfully
   shard:
-    image: linera
+    image: "${LINERA_IMAGE:-linera}"
     deploy:
       replicas: 4
     command: [ "./compose-server-entrypoint.sh" ]
@@ -33,7 +33,7 @@ services:
       shard-init:
         condition: service_completed_successfully
   shard-init:
-    image: linera
+    image: "${LINERA_IMAGE:-linera}"
     container_name: shard-init
     command: [ "./compose-server-init.sh" ]
     volumes:
diff --git a/scripts/deploy-validator.sh b/scripts/deploy-validator.sh
index c5fee2dc2ef..832cba603ac 100755
--- a/scripts/deploy-validator.sh
+++ b/scripts/deploy-validator.sh
@@ -57,10 +57,6 @@ GENESIS_CONFIG="docker/genesis.json"
 echo "Building Linera binaries"
 cargo install --locked --path linera-service
 
-# Build Docker image
-echo "Building Linera docker image"
-docker build --build-arg git_commit="$GIT_COMMIT" -f  docker/Dockerfile . -t linera
-
 # Create validator configuration file
 echo "Creating validator configuration..."
 cat > $VALIDATOR_CONFIG <<EOL
@@ -114,6 +110,7 @@ PUBLIC_KEY=$(linera-server generate --validators validator-config.toml)
 echo "Validator setup completed successfully."
 echo "Starting docker compose..."
 
+export LINERA_IMAGE="us-docker.pkg.dev/linera-io-dev/linera-public-registry/linera:$BRANCH_NAME"
 docker compose up --wait
 
 echo "Public Key: $PUBLIC_KEY"