Build Docker images for Ubuntu 22.04 and 24.04 (#318)

* Build Docker images for Ubuntu 22.04 and 24.04

* comment with question

* default to 24.04

* remove comment

* add JetBrains IDEs to gitignore

* update docker-run cmd

* change suffix to -ubuntu24.04

* review changes: refactor tagging

* whoops

* more tagging fixes

.github/workflows/docker-build.yml

@@ -28,17 +28,18 @@ jobs:
           export DB_VERSION
           echo "DB_VERSION=$DB_VERSION" >> "$GITHUB_ENV"
 
-      - name: Build Docker Image
+      - name: Build Docker Images
         run: |
           export NO_CACHE="${{ github.ref == 'refs/heads/main' }}"
-          DB="$DB_VERSION" make docker-build
+          UBUNTU_RELEASE=noble make docker-build
+          UBUNTU_RELEASE=jammy make docker-build
 
       - name: Log in to registry
         if: github.ref == 'refs/heads/main'
         # This is where you will update the PAT to GITHUB_TOKEN
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-      - name: Push image
+      - name: Push images
         if: github.ref == 'refs/heads/main'
         run: |
           IMAGE_ID="ghcr.io/${{ github.repository_owner }}/idris2-pack"
@@ -47,6 +48,13 @@ jobs:
           # Strip git ref prefix from version
           echo IMAGE_ID="$IMAGE_ID"
           echo DB_VERSION="$DB_VERSION"
-          docker tag "$IMAGE_ID:latest" "$IMAGE_ID:$DB_VERSION"
+          docker tag "$IMAGE_ID:jammy" "$IMAGE_ID:$DB_VERSION-jammy"
+          docker tag "$IMAGE_ID:noble" "$IMAGE_ID:$DB_VERSION-noble"
+          docker tag "$IMAGE_ID:noble" "$IMAGE_ID:$DB_VERSION"
+          docker tag "$IMAGE_ID:noble" "$IMAGE_ID:latest"
           docker push "$IMAGE_ID:latest"
+          docker push "$IMAGE_ID:jammy"
+          docker push "$IMAGE_ID:noble"
           docker push "$IMAGE_ID:$DB_VERSION"
+          docker push "$IMAGE_ID:$DB_VERSION-jammy"
+          docker push "$IMAGE_ID:$DB_VERSION-noble"

.gitignore

@@ -3,3 +3,4 @@ build/
 micropack/libidris2_support.so
 micropack/libidris2_support.dylib
 .vscode/
+.idea/

Dockerfile

@@ -1,6 +1,8 @@
 #checkov:skip=CKV_DOCKER_3: we intend to use `root` user
 
-FROM ubuntu:22.04 AS build
+ARG ubuntu_release
+
+FROM ubuntu:$ubuntu_release AS build
 
 SHELL ["/bin/bash", "-c"]
 
@@ -23,7 +25,7 @@ ENV SCHEME=chezscheme
 
 RUN make micropack SCHEME=$SCHEME
 
-FROM ubuntu:22.04
+FROM ubuntu:$ubuntu_release
 
 # hadolint ignore=DL3008,DL3015
 RUN apt-get update && apt-get install --yes gcc make chezscheme libgmp3-dev git && rm -rf /var/lib/apt/lists/*

Makefile

@@ -4,6 +4,7 @@ export LD_LIBRARY_PATH = micropack
 export DYLD_LIBRARY_PATH = micropack
 
 DOCKER_IMAGE = ghcr.io/stefan-hoeck/idris2-pack
+UBUNTU_RELEASE ?= noble
 NO_CACHE ?= false
 
 .PHONY: micropack
@@ -22,8 +23,8 @@ install-lib:
 
 .PHONY: docker-build
 docker-build:
-	docker build --no-cache=${NO_CACHE} -t ${DOCKER_IMAGE}:latest .
+	docker build --build-arg ubuntu_release=${UBUNTU_RELEASE} --no-cache=${NO_CACHE} -t ${DOCKER_IMAGE}:${UBUNTU_RELEASE} .
 
 .PHONY: docker-run
 docker-run:
-	docker run --rm -it ${DOCKER_IMAGE}:latest /bin/bash
+	docker run --rm -it ${DOCKER_IMAGE}:${UBUNTU_RELEASE} /bin/bash