Minor Refactor

.github/workflows/container-publish.yml

@@ -1,9 +1,9 @@
 on:
+  workflow_dispatch:
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-  workflow_dispatch:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ehfd/nvidia-glx-desktop
@@ -23,28 +23,28 @@ jobs:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Extract Docker metadata
+    - name: Extract Container metadata
       id: meta
       uses: docker/metadata-action@v3
       with:
         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-    - name: Build and push Ubuntu 20.04 Docker image
+    - name: Build and push Ubuntu 18.04 Container image
       uses: docker/build-push-action@v2
       with:
         build-args: |
-          UBUNTU_RELEASE=20.04
+          UBUNTU_RELEASE=18.04
         context: .
         push: ${{ github.event_name != 'pull_request' }}
-        tags: |
-          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:20.04
+        tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:18.04
         labels: ${{ steps.meta.outputs.labels }}
-    - name: Build and push Ubuntu 18.04 Docker image
+    - name: Build and push Ubuntu 20.04 Container image
       uses: docker/build-push-action@v2
       with:
         build-args: |
-          UBUNTU_RELEASE=18.04
+          UBUNTU_RELEASE=20.04
         context: .
         push: ${{ github.event_name != 'pull_request' }}
-        tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:18.04
+        tags: |
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:20.04
         labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -178,7 +178,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         libavahi-client-dev && \
     rm -rf /var/lib/apt/lists/* && \
     X11VNC_VERSION=$(curl -fsSL "https://api.github.com/repos/LibVNC/x11vnc/releases/latest" | jq -r '.tag_name' | sed 's/[^0-9\.\-]*//g') && \
-    curl -fsSL https://github.com/LibVNC/x11vnc/archive/refs/tags/${X11VNC_VERSION}.tar.gz | tar -xzf - -C /tmp && \
+    curl -fsSL https://github.com/LibVNC/x11vnc/archive/${X11VNC_VERSION}.tar.gz | tar -xzf - -C /tmp && \
     cd /tmp/x11vnc-${X11VNC_VERSION} && autoreconf -fi && ./configure && make install && cd / && rm -rf /tmp/* && \
     NOVNC_VERSION=$(curl -fsSL "https://api.github.com/repos/noVNC/noVNC/releases/latest" | jq -r '.tag_name' | sed 's/[^0-9\.\-]*//g') && \
     curl -fsSL https://github.com/novnc/noVNC/archive/v${NOVNC_VERSION}.tar.gz | tar -xzf - -C /opt && \