Merge pull request #85 from JonathanTreffler/feat/add-ubuntu22-docker…

…file

(feat): add ubuntu22 image + build process, update docs

.github/workflows/docker-publish.yml

@@ -27,7 +27,6 @@ jobs:
       contents: read
       packages: write
       id-token: write
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -64,18 +63,66 @@ jobs:
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           context: .
+          file: ./Dockerfile.ubuntu20
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-  build_ubuntu18:
+  build_ubuntu22:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
       id-token: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
 
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image (Ubuntu 22)
+        id: build-and-push-ubuntu22
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          file: ./Dockerfile.ubuntu22
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:ubuntu22
+          labels: ${{ steps.meta.outputs.labels }}
+
+  build_ubuntu18:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## 1.5 - 2023-10-13
+### Changed
+- Dependency updates (see #18 (comment))
+
+## 1.4 - 2023-03-22
+### Changed
+- Dependency updates
+
+## 1.3 - 2023-01-11
+### Changed
+- Update README.md
+
 ## 1.2 - 2022-03-21
 ### Changed
 - Fixed automated build

Dockerfile.ubuntu18

@@ -2,10 +2,10 @@ FROM jlesage/baseimage-gui:ubuntu-18.04-v4@sha256:3cab71f85ed652a87ebf1e02e6771f
 
 RUN apt-get update
 
-RUN apt-get install -y curl wget software-properties-common gnupg2 winbind xvfb
+RUN apt-get install -y curl software-properties-common gnupg2 winbind xvfb
 
 RUN dpkg --add-architecture i386
-RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key
+RUN curl -O https://dl.winehq.org/wine-builds/winehq.key
 RUN apt-key add winehq.key
 RUN add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main'
 RUN apt-get update

Dockerfile → Dockerfile.ubuntu20

@@ -2,10 +2,10 @@ FROM jlesage/baseimage-gui:ubuntu-20.04-v4@sha256:8043c563ef2d47944faa62fb5ab26a
 
 RUN apt-get update
 
-RUN apt-get install -y curl wget software-properties-common gnupg2 winbind xvfb
+RUN apt-get install -y curl software-properties-common gnupg2 winbind xvfb
 
 RUN dpkg --add-architecture i386
-RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key
+RUN curl -O https://dl.winehq.org/wine-builds/winehq.key
 RUN apt-key add winehq.key
 RUN add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
 RUN apt-get update

Dockerfile.ubuntu22

@@ -0,0 +1,36 @@
+FROM jlesage/baseimage-gui:ubuntu-22.04-v4@sha256:bb71746f83b7f048b1bf24e06413510b59558eb26c9673abdea688024b895ba2
+
+RUN apt-get update
+
+RUN apt-get install -y curl software-properties-common gnupg2 winbind xvfb
+
+RUN dpkg --add-architecture i386
+RUN curl -O https://dl.winehq.org/wine-builds/winehq.key
+RUN apt-key add winehq.key
+RUN add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main'
+RUN apt-get update
+RUN apt-get install -y winehq-stable
+
+RUN apt-get install -y winetricks
+
+RUN apt-get clean -y && apt-get autoremove -y
+
+ENV WINEPREFIX /config/wine/
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales
+
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_US.UTF-8
+
+ENV LANG en_US.UTF-8
+
+ENV APP_NAME="Backblaze Personal Backup"
+
+# Disable WINE Debug messages
+ENV WINEDEBUG -all
+
+EXPOSE 5900
+
+COPY startapp.sh /startapp.sh
+RUN chmod +x /startapp.sh

README.md

@@ -74,11 +74,12 @@ Here are the main components of this image:
 | Tag | Description |
 |-----|-------------|
 | latest | Latest stable version of the image based on ubuntu 20 |
+| ubuntu22 | Latest stable version of the image based on ubuntu 22 |
 | ubuntu18 | Latest stable version of the image based on ubuntu 18 |
 | v1.x | Versioned stable releases based on ubuntu 20 |
 | main | Automatic build of the main branch (may be unstable) based on ubuntu 20 |
 
-There are currently no versioned ubuntu18 builds.
+There are currently no versioned ubuntu22 or ubuntu18 builds.
 
 ### Platforms