From c65d4116507772d2e7ce0ed4f8e0edac3fba6dd4 Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Thu, 4 Nov 2021 20:38:25 +0100
Subject: [PATCH] thelounge@4.3.0-pre.6 (#125)

---
 .github/workflows/docker-image-push.yml | 2 +-
 CHANGELOG.md                            | 7 ++-----
 Dockerfile                              | 2 +-
 Makefile                                | 2 +-
 alpine/Dockerfile                       | 6 +++---
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml
index a4e24f9..4bf3907 100644
--- a/.github/workflows/docker-image-push.yml
+++ b/.github/workflows/docker-image-push.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Build Docker image
         env:
-          PLATFORMS: linux/amd64
+          PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7
           DOCKER_REPOSITORY: thelounge/thelounge
         run: |
           TAG="$(git rev-parse --short HEAD)"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a344d8..d108ffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,7 @@
 # Changelog
 
-## 4.3.0-pre.4 (2021-07-04)
-- Bump [`thelounge`][1] to [`4.3.0-pre.4`](https://github.com/thelounge/thelounge/releases/tag/v4.3.0-pre.4).
-- Bump Node version from 12 to 14 (LTS).
-
-*Note: ARM images for 4.3.0-pre.4 are still being worked on.*
+## 4.3.0-pre.6 (2021-11-04)
+- Bump [`thelounge`][1] to [`4.3.0-pre.6`](https://github.com/thelounge/thelounge/releases/tag/v4.3.0-pre.6).
 
 ## 4.2.0 (2020-08-20)
 - Bump [`thelounge`][1] to [`4.2.0`](https://github.com/thelounge/thelounge/releases/tag/v4.2.0).
diff --git a/Dockerfile b/Dockerfile
index 9cc0994..3f27ece 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,6 @@ CMD ["thelounge", "start"]
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 
 # Install thelounge.
-ARG THELOUNGE_VERSION=4.3.0-pre.4
+ARG THELOUNGE_VERSION=4.3.0-pre.6
 RUN yarn --non-interactive --frozen-lockfile global add thelounge@${THELOUNGE_VERSION} && \
     yarn --non-interactive cache clean
diff --git a/Makefile b/Makefile
index 359cf25..392e0de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-THELOUNGE_VERSION?=4.3.0-pre.4
+THELOUNGE_VERSION?=4.3.0-pre.6
 ORGANISATION?=thelounge
 
 all: main alpine
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 0cdc37f..22d778c 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -15,8 +15,8 @@ CMD ["thelounge", "start"]
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 
 # Install thelounge.
-ARG THELOUNGE_VERSION=4.3.0-pre.4
-RUN apk --update --no-cache add python build-base && \
+ARG THELOUNGE_VERSION=4.3.0-pre.6
+RUN apk --update --no-cache add python3 build-base && \
     yarn --non-interactive --frozen-lockfile global add thelounge@${THELOUNGE_VERSION} && \
     yarn --non-interactive cache clean && \
-    apk del python build-base
+    apk del python3 build-base