Development image to test PopPunk branches

.github/workflows/build_and_push.yml

@@ -0,0 +1,25 @@
+name: build and push docker images
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - '*'
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Login to GHCR (GitHub Packages)
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build docker image
+        run: ./docker/build --with-dev # TODO: remove --with_dev before merging
+      - name: Push SHA docker image
+        run: ./docker/push --with-dev  # TODO: remove --with_dev before merging

README.md

@@ -114,6 +114,6 @@ You can build the image with `/docker/build --with-dev`, this new image can now
 
 ### Deployment
 
-A pull request can be created so buildkite pushes the images to the docker hub. Add `--with-dev` to the build & push commands `pipeline.yaml`.
+A pull request can be created so GHA pushes the images to the docker hub. Add `--with-dev` to the build & push commands `pipeline.yaml`.
 **Ensure to remove the `--with-dev` flag before merging the PR.**
 Then on the `beebop-deploy` the api image can be updated with the new dev image.

docker/Dockerfile.dev

@@ -1,5 +1,8 @@
 FROM continuumio/miniconda3
 
+# ensure conda does not install packages for the wrong architecture
+ENV CONDA_OVERRIDE_ARCHSPEC=skylake
+
 ARG POPPUNK_VERSION="v2.6.7"
 
 # Make RUN commands use the new environment:
@@ -55,4 +58,4 @@ COPY . /beebop
 WORKDIR /beebop
 EXPOSE 5000
 
-CMD ["bash", "-c", "conda run --no-capture-output -n base poetry run waitress-serve --port=5000 'beebop.app:app'"]
+CMD ["conda", "run" ,"--no-capture-output", "-n", "base", "poetry", "run", "waitress-serve", "--port=5000", "beebop.app:app"]

docker/common

@@ -1,32 +1,24 @@
 #!/usr/bin/env bash
 set -e
-
+REGISTRY=ghcr.io
 PACKAGE_ROOT=$(realpath $HERE/..)
 PACKAGE_NAME=beebop-py
-PACKAGE_ORG=mrcide
+PACKAGE_ORG=bacpop
 PACKAGE_DEV=dev
 
-# Buildkite doesn't check out a full history from the remote (just the
-# single commit) so you end up with a detached head and git rev-parse
-# doesn't work
-if [ "$BUILDKITE" = "true" ]; then
-    GIT_SHA=${BUILDKITE_COMMIT:0:7}
-else
-    GIT_SHA=$(git -C "$PACKAGE_ROOT" rev-parse --short=7 HEAD)
-fi
-
-if [ "$BUILDKITE" = "true" ]; then
-    GIT_BRANCH=$BUILDKITE_BRANCH
+GIT_SHA=$(git -C "$PACKAGE_ROOT" rev-parse --short=7 HEAD)
+if [[ -v "BRANCH_NAME" ]]; then
+    GIT_BRANCH=${BRANCH_NAME}
 else
-    GIT_BRANCH=$(git -C "$PACKAGE_ROOT" symbolic-ref --short HEAD)
+    GIT_BRANCH=$(git symbolic-ref --short HEAD)
 fi
 
 # production image
-TAG_SHA="${PACKAGE_ORG}/${PACKAGE_NAME}:${GIT_SHA}"
-TAG_BRANCH="${PACKAGE_ORG}/${PACKAGE_NAME}:${GIT_BRANCH}"
-TAG_LATEST="${PACKAGE_ORG}/${PACKAGE_NAME}:latest"
+TAG_SHA="${REGISTRY}/${PACKAGE_ORG}/${PACKAGE_NAME}:${GIT_SHA}"
+TAG_BRANCH="${REGISTRY}/${PACKAGE_ORG}/${PACKAGE_NAME}:${GIT_BRANCH}"
+TAG_LATEST="${REGISTRY}/${PACKAGE_ORG}/${PACKAGE_NAME}:latest"
 
 # development image
-TAG_DEV_SHA="${TAG_SHA}-${PACKAGE_DEV}"
-TAG_DEV_BRANCH="${TAG_BRANCH}-${PACKAGE_DEV}"
+TAG_DEV_SHA="${REGISTRY}/${TAG_SHA}-${PACKAGE_DEV}"
+TAG_DEV_BRANCH="${REGISTRY}/${TAG_BRANCH}-${PACKAGE_DEV}"
 POPPUNK_VERSION=v2.6.7 # can be version, branch or commit

docker/push

@@ -5,7 +5,6 @@ HERE=$(dirname $0)
 . $HERE/common
 
 # In case we switch agents between steps
-[ ! -z $(docker images -q $TAG_SHA) ] || docker pull $TAG_SHA
 
 docker tag $TAG_SHA $TAG_BRANCH
 docker push $TAG_BRANCH