ci: Use separate script to pull container from docker hub

BitBoxSwiss · Aug 19, 2024 · 22ca579 · 22ca579
1 parent a5afb4d
commit 22ca579
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.ci/pull-container b/.ci/pull-container
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+CONTAINER_REPO=shiftcrypto/firmware_v2
+CONTAINER_VERSION=$(cat .containerversion)
+
+docker pull $CONTAINER_REPO:$CONTAINER_VERSION
diff --git a/.ci/run-container-ci b/.ci/run-container-ci
@@ -29,11 +29,6 @@ CONTAINER_REPO=shiftcrypto/firmware_v2
 CONTAINER_VERSION=$(cat .containerversion)
 CONTAINER=$CONTAINER_REPO:${CONTAINER_VERSION}
 
-if [ "$1" == "pull" ] ; then
-	docker pull "$CONTAINER"
-	exit 0
-fi
-
 WORKSPACE_DIR="$1"
 if [ -z "${WORKSPACE_DIR}" ]; then
   echo "Workspace dir path is empty."

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-tags: true
           submodules: recursive
       - name: Pull CI container image
-        run: ./.ci/run-container-ci pull
+        run: ./.ci/pull-container
       - name: Run CI in container
         env:
           COMPARE_REV: ${{ github.event.before }}

diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 0
 
       - name: Pull container image
-        run: ./.ci/run-container-ci pull
+        run: ./.ci/pull-container
 
       - name: Run CI in container
         env:

diff --git a/.github/workflows/prt-ci.yml b/.github/workflows/prt-ci.yml
@@ -80,7 +80,7 @@ jobs:
           git log -1 --format="Head %H, Parents %P"
 
       - name: Pull container image
-        run: ./.ci/run-container-ci pull
+        run: ./.ci/pull-container
 
       - name: Run CI in container
         env: