From df565d6b801373ad67f57eae1c9922e3c8ff08db Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:06:28 +0200 Subject: [PATCH 1/9] bump known-good version --- PINNED_BZ_VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PINNED_BZ_VERSION b/PINNED_BZ_VERSION index aa02a44..b382438 100644 --- a/PINNED_BZ_VERSION +++ b/PINNED_BZ_VERSION @@ -1,2 +1,2 @@ -9.0.1.767 -https://web.archive.org/web/20240224185620/https://secure.backblaze.com/win32/install_backblaze.exe +9.0.1.777 +https://web.archive.org/web/20240602102732/https://secure.backblaze.com/win32/install_backblaze.exe From e2d8625d73919b3e1b24a06fd193ca38b9f52b1c Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:12:42 +0200 Subject: [PATCH 2/9] remove hosts file block --- startapp.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/startapp.sh b/startapp.sh index dc0b8ee..e9dd64d 100644 --- a/startapp.sh +++ b/startapp.sh @@ -124,7 +124,6 @@ if [ -f "${WINEPREFIX}drive_c/Program Files (x86)/Backblaze/bzbui.exe" ]; then # Check if auto-updates are disabled if [ "$DISABLE_AUTOUPDATE" = "true" ]; then - echo "127.0.0.1 f000.backblazeb2.com" >> /etc/hosts log_message "UPDATER: DISABLE_AUTOUPDATE=true, Auto-updates are disabled. Starting Backblaze without updating." start_app fi From 1574c31b04553a92efe4f52b8e62a3e0122d3447 Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:15:46 +0200 Subject: [PATCH 3/9] promote ubuntu22 to main tag --- .github/workflows/docker-publish.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 76fe955..8a167dc 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -21,7 +21,7 @@ env: jobs: - build_ubuntu20: + build_ubuntu22: runs-on: ubuntu-latest permissions: contents: read @@ -58,18 +58,18 @@ jobs: # 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 20) - id: build-and-push-ubuntu20 + - name: Build and push Docker image (Ubuntu 22) + id: build-and-push-ubuntu22 uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . - file: ./Dockerfile.ubuntu20 + file: ./Dockerfile.ubuntu22 push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build_ubuntu22: + build_ubuntu20: runs-on: ubuntu-latest permissions: contents: read @@ -106,15 +106,15 @@ jobs: # 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 + - name: Build and push Docker image (Ubuntu 20) + id: build-and-push-ubuntu20 uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . - file: ./Dockerfile.ubuntu22 + file: ./Dockerfile.ubuntu20 push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64 - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:ubuntu22 + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:ubuntu20 labels: ${{ steps.meta.outputs.labels }} build_ubuntu18: From 0327cddbec433e3c9d6f768e3ad48151e9301725 Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:17:07 +0200 Subject: [PATCH 4/9] update readme for ubuntu22 --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8bdb0cc..2190097 100644 --- a/README.md +++ b/README.md @@ -74,13 +74,13 @@ 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 | +| latest | Latest stable version of the image based on ubuntu 22 | +| ubuntu20 | Latest stable version of the image based on ubuntu 20 | | ubuntu18 | Latest stable version of the image based on ubuntu 18 **(End of Life - unmaintained)** | -| v1.x | Versioned stable releases based on ubuntu 20 | -| main | Automatic build of the main branch (may be unstable) based on ubuntu 20 | +| v1.x | Versioned stable releases based on ubuntu 22 | +| main | Automatic build of the main branch (may be unstable) based on ubuntu 22 | -There are currently no versioned ubuntu22 or ubuntu18 builds. +There are no versioned ubuntu20 or ubuntu18 builds. ### Platforms From 1714cd5b9ab08c1d5ff5b6724205a5a6f4f2589a Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:19:34 +0200 Subject: [PATCH 5/9] remove unnecessary cleanup --- Dockerfile.ubuntu18 | 3 +-- Dockerfile.ubuntu20 | 3 +-- Dockerfile.ubuntu22 | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile.ubuntu18 b/Dockerfile.ubuntu18 index 4b5b709..9b26660 100644 --- a/Dockerfile.ubuntu18 +++ b/Dockerfile.ubuntu18 @@ -24,8 +24,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y locales && \ 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 && \ - apt-get clean -y && apt-get autoremove -y + update-locale LANG=en_US.UTF-8 EXPOSE 5900 diff --git a/Dockerfile.ubuntu20 b/Dockerfile.ubuntu20 index 6cd730c..963bf43 100644 --- a/Dockerfile.ubuntu20 +++ b/Dockerfile.ubuntu20 @@ -24,8 +24,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y locales && \ 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 && \ - apt-get clean -y && apt-get autoremove -y + update-locale LANG=en_US.UTF-8 EXPOSE 5900 diff --git a/Dockerfile.ubuntu22 b/Dockerfile.ubuntu22 index 256ab96..381e53e 100644 --- a/Dockerfile.ubuntu22 +++ b/Dockerfile.ubuntu22 @@ -24,8 +24,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y locales && \ 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 && \ - apt-get clean -y && apt-get autoremove -y + update-locale LANG=en_US.UTF-8 EXPOSE 5900 From 3332468b52f45e955d43484a675ca7a8ab9e3095 Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:23:16 +0200 Subject: [PATCH 6/9] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73178a1..0b4046c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## 1.10 + +### Changed +- Update known-good Backblaze version to 9.0.1.777 +- Ubuntu 22 is now the default versioned image + ## 1.9 ### Changed From a60649273a90948f1789dcc7b28d251909588e86 Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:37:36 +0200 Subject: [PATCH 7/9] add ubuntu22 in addition --- .github/workflows/docker-publish.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 8a167dc..5e47a9c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -66,7 +66,9 @@ jobs: file: ./Dockerfile.ubuntu22 push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64 - tags: ${{ steps.meta.outputs.tags }} + tags: | + ${{ steps.meta.outputs.tags }} + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:ubuntu22 labels: ${{ steps.meta.outputs.labels }} build_ubuntu20: From bddbd198b2f36d7b489039f6f461e53b4f7ec0bc Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:38:12 +0200 Subject: [PATCH 8/9] change readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2190097..64a466b 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ Here are the main components of this image: | Tag | Description | |-----|-------------| | latest | Latest stable version of the image based on ubuntu 22 | +| ubuntu22 | Latest stable version of the image based on ubuntu 22 | | ubuntu20 | Latest stable version of the image based on ubuntu 20 | | ubuntu18 | Latest stable version of the image based on ubuntu 18 **(End of Life - unmaintained)** | | v1.x | Versioned stable releases based on ubuntu 22 | From 0d6f73ce4bcbe04cd282ab9693e6bbd991f09ab2 Mon Sep 17 00:00:00 2001 From: Traktuner <78533119+traktuner@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:28:05 +0200 Subject: [PATCH 9/9] put files which need to be copied to the docker container into rootfs folder --- Dockerfile.ubuntu18 | 2 +- Dockerfile.ubuntu20 | 2 +- Dockerfile.ubuntu22 | 2 +- PINNED_BZ_VERSION => rootfs/PINNED_BZ_VERSION | 0 startapp.sh => rootfs/startapp.sh | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename PINNED_BZ_VERSION => rootfs/PINNED_BZ_VERSION (100%) rename startapp.sh => rootfs/startapp.sh (100%) diff --git a/Dockerfile.ubuntu18 b/Dockerfile.ubuntu18 index 9b26660..66e6ee9 100644 --- a/Dockerfile.ubuntu18 +++ b/Dockerfile.ubuntu18 @@ -28,5 +28,5 @@ RUN apt-get update && \ EXPOSE 5900 -COPY startapp.sh PINNED_BZ_VERSION / +COPY rootfs/ / RUN chmod +x /startapp.sh \ No newline at end of file diff --git a/Dockerfile.ubuntu20 b/Dockerfile.ubuntu20 index 963bf43..4e747eb 100644 --- a/Dockerfile.ubuntu20 +++ b/Dockerfile.ubuntu20 @@ -28,5 +28,5 @@ RUN apt-get update && \ EXPOSE 5900 -COPY startapp.sh PINNED_BZ_VERSION / +COPY rootfs/ / RUN chmod +x /startapp.sh \ No newline at end of file diff --git a/Dockerfile.ubuntu22 b/Dockerfile.ubuntu22 index 381e53e..8b04614 100644 --- a/Dockerfile.ubuntu22 +++ b/Dockerfile.ubuntu22 @@ -28,5 +28,5 @@ RUN apt-get update && \ EXPOSE 5900 -COPY startapp.sh PINNED_BZ_VERSION / +COPY rootfs/ / RUN chmod +x /startapp.sh \ No newline at end of file diff --git a/PINNED_BZ_VERSION b/rootfs/PINNED_BZ_VERSION similarity index 100% rename from PINNED_BZ_VERSION rename to rootfs/PINNED_BZ_VERSION diff --git a/startapp.sh b/rootfs/startapp.sh similarity index 100% rename from startapp.sh rename to rootfs/startapp.sh