Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* [email protected]

* use LTS node version
  • Loading branch information
williamboman authored Mar 16, 2021
1 parent ea0725a commit 1fbe96c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 4.3.0-pre.1 (2021-03-16)
- Bump [`thelounge`][1] to [`4.3.0-pre.1`](https://github.com/thelounge/thelounge/releases/tag/v4.3.0-pre.1).
- Bump Node version from 12 to 14 (LTS).

## 4.2.0 (2020-08-20)
- Bump [`thelounge`][1] to [`4.2.0`](https://github.com/thelounge/thelounge/releases/tag/v4.2.0).
- Add support for ARM (ARM64 + ARMv7) images ([#109](https://github.com/thelounge/thelounge-docker/pull/109)) by [@klausenbusk](https://github.com/klausenbusk)
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12
FROM node:lts

ENV NODE_ENV production

Expand All @@ -15,6 +15,6 @@ CMD ["thelounge", "start"]
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

# Install thelounge.
ARG THELOUNGE_VERSION=4.2.0
ARG THELOUNGE_VERSION=4.3.0-pre.1
RUN yarn --non-interactive --frozen-lockfile global add thelounge@${THELOUNGE_VERSION} && \
yarn --non-interactive cache clean
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
THELOUNGE_VERSION?=4.2.0
THELOUNGE_VERSION?=4.3.0-pre.1
ORGANISATION?=thelounge

all: main alpine
Expand Down
4 changes: 2 additions & 2 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:lts-alpine

ENV NODE_ENV production

Expand All @@ -15,7 +15,7 @@ CMD ["thelounge", "start"]
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

# Install thelounge.
ARG THELOUNGE_VERSION=4.2.0
ARG THELOUNGE_VERSION=4.3.0-pre.1
RUN apk --update --no-cache add python build-base && \
yarn --non-interactive --frozen-lockfile global add thelounge@${THELOUNGE_VERSION} && \
yarn --non-interactive cache clean && \
Expand Down
12 changes: 11 additions & 1 deletion update-version.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
#!/bin/bash

command -v gsed &> /dev/null || {
>&2 echo "gsed command missing"
exit 1
}

NEW_VERSION="$1"

if [[ ! $NEW_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then
>&2 echo "Provided version (\"$NEW_VERSION\") is not in a valid format."
exit 1
fi

replace_regex_in_file() {
local REGEX="$1"
shift 1
local FILES=$@
for file in $FILES; do
sed -i -E "s/${REGEX}/\1${NEW_VERSION}/" "$file"
gsed -i -E "s/${REGEX}/\1${NEW_VERSION}/" "$file"
done
}

Expand Down

0 comments on commit 1fbe96c

Please sign in to comment.