Skip to content

Commit

Permalink
update builds to compile sqlite3 node module from source on arm variants
Browse files Browse the repository at this point in the history
  • Loading branch information
thelamer committed May 15, 2019
1 parent ca98d84 commit e165536
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 6 deletions.
11 changes: 10 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ NPM_CONFIG_LOGLEVEL="info"

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache --virtual=build-dependencies \
gcc \
g++ \
make \
python-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
jq \
Expand All @@ -27,10 +33,13 @@ RUN \
/app && \
cd /app && \
npm install -g \
thelounge@${THELOUNGE_VERSION} && \
thelounge@${THELOUNGE_VERSION} \
sqlite3 && \
echo "**** ensure public true on startup aka no users ****" && \
sed -i "s/public: false,/public: true,/g" /usr/lib/node_modules/thelounge/defaults/config.js && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root && \
mkdir -p / \
Expand Down
13 changes: 11 additions & 2 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM lsiobase/alpine:arm32v7-3.9
FROM lsiobase/alpine:arm64v8-3.9

# set version label
ARG BUILD_DATE
Expand All @@ -13,6 +13,12 @@ NPM_CONFIG_LOGLEVEL="info"

RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache --virtual=build-dependencies \
gcc \
g++ \
make \
python-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
jq \
Expand All @@ -27,10 +33,13 @@ RUN \
/app && \
cd /app && \
npm install -g \
thelounge@${THELOUNGE_VERSION} && \
thelounge@${THELOUNGE_VERSION} \
sqlite3 && \
echo "**** ensure public true on startup aka no users ****" && \
sed -i "s/public: false,/public: true,/g" /usr/lib/node_modules/thelounge/defaults/config.js && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root && \
mkdir -p / \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
* **15.05.19:** - Update Arm variant images to build sqlite3 module.
* **22.02.19:** - Rebasing to alpine 3.9.
* **28.01.19:** - Add pipeline logic and multi arch.
* **25.08.18:** - Use global install, simplifies adding users.
Expand Down
4 changes: 2 additions & 2 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ app_setup_block: "
# changelog

changelogs:
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
- { date: "15.05.19:", desc: "Update Arm variant images to build sqlite3 module." }
- { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
- { date: "28.01.19:", desc: "Add pipeline logic and multi arch." }
- { date: "25.08.18:", desc: "Use global install, simplifies adding users." }
Expand All @@ -58,4 +58,4 @@ changelogs:
- { date: "14.10.16:", desc: "Bump to pickup 2.10 release." }
- { date: "14.10.16:", desc: "Add version layer information." }
- { date: "11.09.16:", desc: "Add layer badges to README." }
- { date: "31.08.16:", desc: "Initial Release." }
- { date: "31.08.16:", desc: "Initial Release." }

0 comments on commit e165536

Please sign in to comment.