ci: Use separate script to pull container from docker hub

Author: NickeZ

.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

.ci/run-container-ci

@@ -16,8 +16,7 @@
 
 # The script runs all CI builds and checks in a Docker container.
 # It accepts two positional arguments:
-# 1. A workspace dir, the root of the git repo clone, or "pull" literal.
-#    In the latter case, CI container image is pulled from a registry.
+# 1. A workspace dir, the root of the git repo clone, to be mounted in the container.
 # 2. A git revision (see man gitrevisions) to compare against HEAD to filter out modified and new
 #    files. Some scripts only run on that subset.
 
@@ -28,11 +27,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."

.github/workflows/ci.yml

@@ -18,6 +18,6 @@ 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
         run: ./.ci/run-container-ci ${{github.workspace}} ${{ github.event.before }}

.github/workflows/pr-ci.yml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: Pull container image
-        run: ./.ci/run-container-ci pull
+        run: ./.ci/pull-container
 
       - name: Run CI in container
         run: ./.ci/run-container-ci ${{github.workspace}} ${{ github.event.pull_request.base.sha }}
@@ -67,7 +67,7 @@ jobs:
           git checkout -f ${{ github.event.pull_request.merge_commit_sha }} -- .ci .github
 
       - name: Pull container image
-        run: ./.ci/run-container-ci pull
+        run: ./.ci/pull-container
 
       - name: Run CI in container
         run: ./.ci/run-container-ci ${{github.workspace}} ${{ github.event.pull_request.base.sha }}