Remove focal build, add registry and tag vars to .env

Author: andy5995

.env

@@ -1,6 +1,8 @@
 # Your numeric uid and gid
 HOSTUID=
 HOSTGID=
+TAG=v3-jammy
+REGISTRY_IMAGE=andy5995/linuxdeploy
 
 # When run from the root of your project directory, this will be
 # the location in the container

.github/workflows/docker.yml

@@ -29,7 +29,6 @@ jobs:
           - ubuntu-24.04-arm
           - ubuntu-24.04
         codename:
-          - focal
           - jammy
 
       fail-fast: true
@@ -97,7 +96,6 @@ jobs:
     strategy:
       matrix:
         codename:
-          - focal
           - jammy
       fail-fast: true
 

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
   test-rmw:
     runs-on: ubuntu-latest
     env:
-      REGISTRY_IMAGE: andy5995/linuxdeploy:v3-focal
+      REGISTRY_IMAGE: andy5995/linuxdeploy:v3-jammy
       DOCKER_CACHE_DEST: ${{ github.workspace }}/.docker/buildx-cache-${{ matrix.platform }}
     strategy:
       matrix:
@@ -103,7 +103,7 @@ jobs:
             . \
             -t $REGISTRY_IMAGE \
             --platform=${{ matrix.platform }} \
-            --build-arg CODENAME=focal \
+            --build-arg CODENAME=jammy \
             --cache-to=type=local,dest=${{ env.DOCKER_CACHE_DEST }} \
             --cache-from=type=local,src=${{ env.DOCKER_CACHE_DEST }} \
             --load

Dockerfile

@@ -1,6 +1,6 @@
-ARG CODENAME=focal
+ARG CODENAME=jammy
 FROM ubuntu:$CODENAME
-ARG CODENAME=focal
+ARG CODENAME=jammy
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN \
@@ -118,19 +118,11 @@ USER root
 ARG DEBIAN_FRONTEND=noninteractive
 RUN \
   apt update && \
-  if [ "$CODENAME" = "focal" ];then \
-    apt install --no-install-recommends -y \
-      libgtk2.0-dev \
-      libgtk-3-dev \
-      nlohmann-json3-dev \
-      qt5-default;  \
-  else \
-    apt install --no-install-recommends -y \
-      libgtk2.0-dev \
-      libgtk-3-dev \
-      nlohmann-json3-dev \
-      qtbase5-dev; \
-  fi && \
+  apt install --no-install-recommends -y \
+    libgtk2.0-dev \
+    libgtk-3-dev \
+    nlohmann-json3-dev \
+    qtbase5-dev && \
   rm -rf /var/lib/apt/lists
 
 USER builder

README.md

@@ -4,10 +4,7 @@ A docker container that aims to help build an
 [AppImage](https://github.com/AppImage/AppImageKit) on multiple architectures
 using [linuxdeploy](https://github.com/linuxdeploy/linuxdeploy).
 
-Latest version: v3-focal
-
-v3-jammy is also available if for some reason you require a more recent
-version Ubuntu.
+Latest version: v3-jammy
 
 ## Available architectures
 
@@ -45,7 +42,11 @@ You may use `sudo` in your script to install packages or do other things.
 
 If you would like to look around the container, you can use
 
-    docker run -it --rm --entrypoint bash andy5995/linuxdeploy:v3-focal
+    docker run -it --rm --entrypoint bash andy5995/linuxdeploy:v3-jammy
+
+> [!NOTE]
+> The image is also available from the GitHub Container Registry:
+> `docker pull ghcr.io/andy5995/linuxdeploy-build-helper-container:v3-jammy`
 
 ## Locally
 
@@ -83,7 +84,7 @@ These plugins are installed in the container:
 
 ## Note
 
-The container runs Ubuntu 20.04 (Focal Fossil). See [this
+The container runs Ubuntu 22.04 (Jammy Jellyfish). See [this
 discussion](https://github.com/orgs/AppImage/discussions/1254) for more
 details on why I chose that version of Ubuntu.
 

docker-compose.yml

@@ -4,7 +4,7 @@ services:
       HOSTUID: ${HOSTUID}
       HOSTGID: ${HOSTGID}
       VERSION: ${VERSION}
-    image: andy5995/linuxdeploy:v3-focal
+    image: ${REGISTRY_IMAGE}:${TAG}
     platform: ${PLATFORM:-linux/amd64}
     volumes:
       - $PWD:$WORKSPACE