ci: fix build scripts

Author: stevearc

.github/workflows/build.yml

@@ -2,13 +2,18 @@ name: CI
 on:
   release:
     types: [released, prereleased]
-  workflow_dispatch:  # allow manually running from the Actions tab
+  workflow_dispatch: # allow manually running from the Actions tab
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    env:
-      BUILDX_PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
+    strategy:
+      matrix:
+        include:
+          - image: baseimage
+            platform: linux/amd64,linux/arm64
+          - image: alpine
+            platform: linux/amd64
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1
@@ -17,4 +22,4 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      - run: bash build.sh --publish
+      - run: bash build.sh --publish -i ${{matrix.image}} -p ${{matrix.platform}}

build.sh

@@ -1,32 +1,93 @@
 #!/bin/bash
 set -e -o pipefail
-shopt -s expand_aliases
 
-./cp-static.sh
-tag=$(git describe --tags)
-platforms=${BUILDX_PLATFORMS:-linux/amd64}
-alias buildx_build="docker buildx build --platform=${platforms}"
+usage="$0 -i <image> [options]
+  -i <image>    \"baseimage\" or \"alpine\"
+  -p <platform> Build images for this platform(s)
+  --test        Run tests after build
+  --publish     Run tests and push images after build
+"
+while getopts "h-:i:p:" opt; do
+  case $opt in
+    -)
+      case $OPTARG in
+        test)
+          TEST=1
+          ;;
+        publish)
+          TEST=1
+          PUBLISH=1
+          ;;
+        *)
+          echo "$usage"
+          exit 1
+          ;;
+      esac
+      ;;
+    i)
+      IMAGE="$OPTARG"
+      ;;
+    p)
+      PLATFORM="$OPTARG"
+      ;;
+    h)
+      echo "$usage"
+      exit 0
+      ;;
+    \?)
+      echo "$usage"
+      exit 1
+      ;;
+  esac
+done
+if [ -z "$IMAGE" ]; then
+  echo "$usage"
+  exit 1
+fi
+shift $((OPTIND - 1))
+
+tag=$(git describe --tags || echo "latest")
+platforms="${PLATFORM:-linux/amd64}"
 echo "Building ${tag} for platforms ${platforms}"
+set -x
+./cp-static.sh
 
-buildx_build --pull py3-baseimage -t "stevearc/pypicloud:latest"
-buildx_build --pull py3-alpine -t "stevearc/pypicloud:latest-alpine"
+case $IMAGE in
+  baseimage)
+    suffix=""
+    ;;
+  alpine)
+    suffix="-$IMAGE"
+    ;;
+  *)
+    echo "Unrecognized image $IMAGE"
+    exit 1
+    ;;
+esac
+docker buildx build "--platform=${platforms}" --pull "py3-$IMAGE" -t "stevearc/pypicloud:latest${suffix}"
 
-if [ "$1" == '--publish' ]; then
+if [ $TEST ]; then
+  echo "Build and load single-platform image for test"
+  if [[ $platforms =~ , ]]; then
+    docker buildx build "--platform=linux/amd64" "py3-$IMAGE" --load -t "stevearc/pypicloud:latest${suffix}"
+  else
+    docker buildx build "--platform=${platforms}" "py3-$IMAGE" --load -t "stevearc/pypicloud:latest${suffix}"
+  fi
+  echo "Running tests"
+  ./test.sh "latest$suffix"
+  echo "Tests passed"
+fi
+
+if [ $PUBLISH ]; then
   if [ -n "$(git status --porcelain)" ]; then
     git status
     echo ""
     echo "Repo is not clean. Refusing to publish."
     exit 1
   fi
-  echo "Running tests"
-  ./test.sh latest
-  ./test.sh latest-alpine
-  echo "Tests passed"
-  buildx_build --push py3-baseimage -t "stevearc/pypicloud:latest"
-  buildx_build --push py3-alpine -t "stevearc/pypicloud:latest-alpine"
+  docker buildx build "--platform=${platforms}" --push "py3-$IMAGE" -t "stevearc/pypicloud:latest$suffix"
   if git describe --tags --exact-match; then
-    buildx_build --push py3-baseimage -t "stevearc/pypicloud:$tag"
-    buildx_build --push py3-alpine -t "stevearc/pypicloud:$tag-alpine"
+    docker buildx build "--platform=${platforms}" --push "py3-$IMAGE" -t "stevearc/pypicloud:${tag}${suffix}"
   else
     echo "Not pushing $tag because it is not an exact version"
   fi

test.sh

@@ -9,7 +9,7 @@ cleanup() {
 trap cleanup SIGINT SIGTERM EXIT
 
 docker rm -f "$CONTAINER" >/dev/null 2>&1 || true
-docker run -d --name "$CONTAINER" -P "stevearc/pypicloud:$tag"
+docker run --pull never -d --name "$CONTAINER" -P "stevearc/pypicloud:$tag"
 sleep 5
 
 port=$(docker inspect "$CONTAINER" | jq -r '.[0].NetworkSettings.Ports["8080/tcp"][0].HostPort')