[email protected] (#136)

.github/workflows/docker-image-push.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dockerfile: [Dockerfile, alpine/Dockerfile]
+        dockerfile: [Dockerfile]
     steps:
       - name: Checkout
         uses: actions/checkout@v1

.github/workflows/docker-image-test.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [linux/amd64, linux/arm64/v8, linux/arm/v7]
-        dockerfile: [Dockerfile, alpine/Dockerfile]
+        dockerfile: [Dockerfile]
     steps:
       - name: Set env
         run: echo "mount_dir=$(mktemp -d)" >> $GITHUB_ENV

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
-## Unreleased
+## 4.3.1-rc.1 (2022-03-03)
 - Rebuild latest stable release images on a weekly basis.
+- Bump [`thelounge`][1] to [`4.3.1-rc.1`](https://github.com/thelounge/thelounge/releases/tag/v4.3.1-rc.1).
+
+#### Breaking changes
+- Only provide an alpine image. The `:alpine` tag will now be `:latest`. Versioned tags will also no longer have the `-alpine` suffix.
 
 ## 4.3.0 (2021-11-23)
 - Bump [`thelounge`][1] to [`4.3.0`](https://github.com/thelounge/thelounge/releases/tag/v4.3.0).

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:lts-bullseye
+FROM node:lts-alpine
 
 ENV NODE_ENV production
 
@@ -15,12 +15,8 @@ CMD ["thelounge", "start"]
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 
 # Install thelounge.
-ARG THELOUNGE_VERSION=4.3.0
-RUN apt update && apt install -y python2 g++ make && \
-    ln -s $(which python2) /usr/bin/python && \
+ARG THELOUNGE_VERSION=4.3.1-rc.1
+RUN apk --update --no-cache --virtual build-deps add python2 build-base git && \
     yarn --non-interactive --frozen-lockfile global add thelounge@${THELOUNGE_VERSION} && \
     yarn --non-interactive cache clean && \
-    apt remove -y python2 g++ make && \
-    apt autoremove -y && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -f /usr/bin/python
+    apk del build-deps

Makefile

@@ -1,12 +1,9 @@
-THELOUNGE_VERSION?=4.3.0
+THELOUNGE_VERSION?=4.3.1-rc.1
 ORGANISATION?=thelounge
 
-all: main alpine
+all: main
 
 main:
 	docker build -t ${ORGANISATION}/thelounge:${THELOUNGE_VERSION} --build-arg THELOUNGE_VERSION=${THELOUNGE_VERSION} .
 
-alpine:
-	docker build -f alpine/Dockerfile -t ${ORGANISATION}/thelounge:${THELOUNGE_VERSION}-alpine --build-arg THELOUNGE_VERSION=${THELOUNGE_VERSION} alpine
-
-.PHONY: main alpine
+.PHONY: main

scripts/build-and-push.sh

@@ -8,12 +8,6 @@ TAG="$VERSION"
 MAJOR_TAG="$(sed -nre 's/^([0-9]+).*/\1/p' <<< "$VERSION")"
 LATEST_TAG="latest"
 
-if grep -q "^alpine/" <<< "${DOCKERFILE}"; then
-    TAG="${VERSION}-alpine"
-    MAJOR_TAG="${MAJOR_TAG}-alpine"
-    LATEST_TAG="alpine"
-fi
-
 # If not a pre-release push LATEST_TAG & MAJOR_TAG
 if grep -qE "^[0-9]*\.[0-9]*\.[0-9]*$" <<< "${VERSION}"; then
     EXTRA_ARG+=("--tag" "${DOCKER_REPOSITORY}:${LATEST_TAG}")

scripts/update-version.sh

@@ -30,6 +30,6 @@ EOF
 }
 
 replace_regex_in_file "(THELOUNGE_VERSION\?=).*$" Makefile
-replace_regex_in_file "(ARG THELOUNGE_VERSION=).*$" alpine/Dockerfile Dockerfile
+replace_regex_in_file "(ARG THELOUNGE_VERSION=).*$" Dockerfile
 
 (echo 2a; changelog_text; echo .; echo w) | ed - CHANGELOG.md