diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml index 0358ac3..91f744d 100644 --- a/.github/workflows/docker-image-push.yml +++ b/.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 diff --git a/.github/workflows/docker-image-test.yml b/.github/workflows/docker-image-test.yml index 308499e..7c1991f 100644 --- a/.github/workflows/docker-image-test.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 41f9cfd..4d3de6d 100644 --- a/CHANGELOG.md +++ b/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). diff --git a/Dockerfile b/Dockerfile index fdc79d4..365f1a0 100644 --- a/Dockerfile +++ b/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 diff --git a/Makefile b/Makefile index f11e769..4f05e38 100644 --- a/Makefile +++ b/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 diff --git a/alpine/Dockerfile b/alpine/Dockerfile deleted file mode 100644 index f632e22..0000000 --- a/alpine/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM node:lts-alpine - -ENV NODE_ENV production - -ENV THELOUNGE_HOME "/var/opt/thelounge" -VOLUME "${THELOUNGE_HOME}" - -# Expose HTTP. -ENV PORT 9000 -EXPOSE ${PORT} - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["thelounge", "start"] - -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -# Install thelounge. -ARG THELOUNGE_VERSION=4.3.0 -RUN apk --update --no-cache add python2 build-base && \ - yarn --non-interactive --frozen-lockfile global add thelounge@${THELOUNGE_VERSION} && \ - yarn --non-interactive cache clean && \ - apk del python2 build-base diff --git a/scripts/build-and-push.sh b/scripts/build-and-push.sh index 30a8b72..1f8057a 100755 --- a/scripts/build-and-push.sh +++ b/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}") diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 052d4fc..5db744a 100755 --- a/scripts/update-version.sh +++ b/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