From e1655366784b7697361a8f1ecceef6dd8ed5d125 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 15 May 2019 14:49:45 -0700 Subject: [PATCH 1/2] update builds to compile sqlite3 node module from source on arm variants --- Dockerfile.aarch64 | 11 ++++++++++- Dockerfile.armhf | 13 +++++++++++-- README.md | 2 +- readme-vars.yml | 4 ++-- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 548296b..5c1cfc0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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 \ @@ -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 / \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 13377eb..5c1cfc0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.9 +FROM lsiobase/alpine:arm64v8-3.9 # set version label ARG BUILD_DATE @@ -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 \ @@ -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 / \ diff --git a/README.md b/README.md index 02e28ad..704a3ab 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/readme-vars.yml b/readme-vars.yml index e3a2013..c8d0255 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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." } @@ -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." } \ No newline at end of file + - { date: "31.08.16:", desc: "Initial Release." } From 1015e5536b540506acd35930c017fbb9928d20c5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 15 May 2019 14:53:58 -0700 Subject: [PATCH 2/2] multiple typos --- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 4 ++-- README.md | 1 + readme-vars.yml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5c1cfc0..5a9658b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,7 +12,7 @@ ENV THELOUNGE_HOME="/config" \ NPM_CONFIG_LOGLEVEL="info" RUN \ - echo "**** install runtime packages ****" && \ + echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ gcc \ g++ \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5c1cfc0..db855d5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.9 +FROM lsiobase/alpine:arm32v7-3.9 # set version label ARG BUILD_DATE @@ -12,7 +12,7 @@ ENV THELOUNGE_HOME="/config" \ NPM_CONFIG_LOGLEVEL="info" RUN \ - echo "**** install runtime packages ****" && \ + echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ gcc \ g++ \ diff --git a/README.md b/README.md index 704a3ab..ac81be0 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions * **15.05.19:** - Update Arm variant images to build sqlite3 module. +* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **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. diff --git a/readme-vars.yml b/readme-vars.yml index c8d0255..b680494 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: " changelogs: - { date: "15.05.19:", desc: "Update Arm variant images to build sqlite3 module." } + - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { 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." }