Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump known-good Backblaze version, Ubuntu 22 as default #165

Merged
merged 9 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:


jobs:
build_ubuntu20:
build_ubuntu22:
runs-on: ubuntu-latest
permissions:
contents: read
Expand Down Expand Up @@ -58,18 +58,20 @@ 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 }}
tags: |
${{ steps.meta.outputs.tags }}
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:ubuntu22
labels: ${{ steps.meta.outputs.labels }}

build_ubuntu22:
build_ubuntu20:
runs-on: ubuntu-latest
permissions:
contents: read
Expand Down Expand Up @@ -106,15 +108,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:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile.ubuntu18
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ 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

COPY startapp.sh PINNED_BZ_VERSION /
COPY rootfs/ /
RUN chmod +x /startapp.sh
5 changes: 2 additions & 3 deletions Dockerfile.ubuntu20
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ 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

COPY startapp.sh PINNED_BZ_VERSION /
COPY rootfs/ /
RUN chmod +x /startapp.sh
5 changes: 2 additions & 3 deletions Dockerfile.ubuntu22
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ 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

COPY startapp.sh PINNED_BZ_VERSION /
COPY rootfs/ /
RUN chmod +x /startapp.sh
2 changes: 0 additions & 2 deletions PINNED_BZ_VERSION

This file was deleted.

9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,14 @@ Here are the main components of this image:

| Tag | Description |
|-----|-------------|
| latest | Latest stable version of the image based on ubuntu 20 |
| 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 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

Expand Down
2 changes: 2 additions & 0 deletions rootfs/PINNED_BZ_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
9.0.1.777
https://web.archive.org/web/20240602102732/https://secure.backblaze.com/win32/install_backblaze.exe
1 change: 0 additions & 1 deletion startapp.sh → rootfs/startapp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading