From 26d5de3822a5f37a0fa9b83e81b255d2917576c6 Mon Sep 17 00:00:00 2001
From: Github Action <gha@cardanofoundation.org>
Date: Mon, 24 Jun 2024 09:02:47 +0000
Subject: [PATCH] Add "Build docker image" step

---
 .buildkite/docker-build-push.nix           |  2 +-
 .buildkite/release.yml                     | 11 ++++++++++-
 scripts/buildkite/release/docker-build.sh  | 21 +++++++++++++++++++++
 scripts/buildkite/release/linux-package.sh |  6 ++++--
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100755 scripts/buildkite/release/docker-build.sh

diff --git a/.buildkite/docker-build-push.nix b/.buildkite/docker-build-push.nix
index 945f4fdbc6d..ec0478a2a9b 100644
--- a/.buildkite/docker-build-push.nix
+++ b/.buildkite/docker-build-push.nix
@@ -78,7 +78,7 @@ in
       tags+=( "${image.imageTag}" )
       tags+=( "latest" )
     elif [[ "$git_tag" = "rc-latest" ]]; then
-      tags+=( "$git_tag" )
+      tags+=( "$git_tag")
     else
       echo 'Not pushing docker image because this is neither a rc-latest nor a v20* tag build.'
     fi
diff --git a/.buildkite/release.yml b/.buildkite/release.yml
index bb1998e6fb0..4af5fbc38e4 100644
--- a/.buildkite/release.yml
+++ b/.buildkite/release.yml
@@ -22,7 +22,7 @@ steps:
       - ./scripts/buildkite/release/linux-package.sh
     artifact_paths: [ "./result/linux/**" ]
     agents:
-      system: ${linux}
+      system: x86_64-linux
 
   - label: 'Refresh node state'
     key: refresh-node-state
@@ -31,6 +31,15 @@ steps:
     agents:
       system: x86_64-linux
 
+  - label: 'Build Docker Image'
+    key: build-docker
+    depends_on:
+      - add-release-commits
+    commands:
+      ./scripts/buildkite/release/docker-build.sh
+    agents:
+      system: x86_64-linux
+
   - label: 'Run linux e2e tests'
     depends_on:
       - add-release-commits
diff --git a/scripts/buildkite/release/docker-build.sh b/scripts/buildkite/release/docker-build.sh
new file mode 100755
index 00000000000..f5c957a2509
--- /dev/null
+++ b/scripts/buildkite/release/docker-build.sh
@@ -0,0 +1,21 @@
+#! /usr/bin/env -S nix shell --command bash
+# shellcheck shell=bash
+
+set -euox pipefail
+
+git fetch --all
+
+RELEASE_COMMIT=$(buildkite-agent meta-data get "release-commit")
+
+git checkout "$RELEASE_COMMIT"
+
+mkdir -p config
+
+echo '{ outputs = _: { dockerHubRepoName = "cardanofoundation/cardano-wallet"; }; }'  \
+        > config/flake.nix
+
+nix build .#pushDockerImage \
+    --override-input hostNixpkgs path:$(nix eval --impure -I $NIX_PATH --expr '(import <nixpkgs> {}).path') \
+    --override-input customConfig path:./config -o docker-build-push
+
+./docker-build-push
\ No newline at end of file
diff --git a/scripts/buildkite/release/linux-package.sh b/scripts/buildkite/release/linux-package.sh
index cf359f2791d..debd7694ba0 100755
--- a/scripts/buildkite/release/linux-package.sh
+++ b/scripts/buildkite/release/linux-package.sh
@@ -1,8 +1,10 @@
 #! /usr/bin/env -S nix shell --command bash
 # shellcheck shell=bash
 
-RELEASE_CANDIDATE_BRANCH=$(buildkite-agent meta-data get "release-candidate-branch")
+set -euox pipefail
 
-git checkout "$RELEASE_CANDIDATE_BRANCH"
+RELEASE_COMMIT=$(buildkite-agent meta-data get "release-commit")
+
+git checkout "$RELEASE_COMMIT"
 
 nix build -o result/linux .#ci.artifacts.linux64.release
\ No newline at end of file