Skip to content

Commit 96ef8de

Browse files
authored
Merge pull request #26 from thelamer/master
#25 add sqlite3 building on arm hosts
2 parents ca98d84 + 1015e55 commit 96ef8de

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

Dockerfile.aarch64

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ ENV THELOUNGE_HOME="/config" \
1212
NPM_CONFIG_LOGLEVEL="info"
1313

1414
RUN \
15+
echo "**** install build packages ****" && \
16+
apk add --no-cache --virtual=build-dependencies \
17+
gcc \
18+
g++ \
19+
make \
20+
python-dev && \
1521
echo "**** install runtime packages ****" && \
1622
apk add --no-cache \
1723
curl \
@@ -27,10 +33,13 @@ RUN \
2733
/app && \
2834
cd /app && \
2935
npm install -g \
30-
thelounge@${THELOUNGE_VERSION} && \
36+
thelounge@${THELOUNGE_VERSION} \
37+
sqlite3 && \
3138
echo "**** ensure public true on startup aka no users ****" && \
3239
sed -i "s/public: false,/public: true,/g" /usr/lib/node_modules/thelounge/defaults/config.js && \
3340
echo "**** cleanup ****" && \
41+
apk del --purge \
42+
build-dependencies && \
3443
rm -rf \
3544
/root && \
3645
mkdir -p / \

Dockerfile.armhf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ ENV THELOUNGE_HOME="/config" \
1212
NPM_CONFIG_LOGLEVEL="info"
1313

1414
RUN \
15+
echo "**** install build packages ****" && \
16+
apk add --no-cache --virtual=build-dependencies \
17+
gcc \
18+
g++ \
19+
make \
20+
python-dev && \
1521
echo "**** install runtime packages ****" && \
1622
apk add --no-cache \
1723
curl \
@@ -27,10 +33,13 @@ RUN \
2733
/app && \
2834
cd /app && \
2935
npm install -g \
30-
thelounge@${THELOUNGE_VERSION} && \
36+
thelounge@${THELOUNGE_VERSION} \
37+
sqlite3 && \
3138
echo "**** ensure public true on startup aka no users ****" && \
3239
sed -i "s/public: false,/public: true,/g" /usr/lib/node_modules/thelounge/defaults/config.js && \
3340
echo "**** cleanup ****" && \
41+
apk del --purge \
42+
build-dependencies && \
3443
rm -rf \
3544
/root && \
3645
mkdir -p / \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
181181

182182
## Versions
183183

184+
* **15.05.19:** - Update Arm variant images to build sqlite3 module.
184185
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
185186
* **22.02.19:** - Rebasing to alpine 3.9.
186187
* **28.01.19:** - Add pipeline logic and multi arch.

readme-vars.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ app_setup_block: "
4747
# changelog
4848

4949
changelogs:
50+
- { date: "15.05.19:", desc: "Update Arm variant images to build sqlite3 module." }
5051
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
5152
- { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
5253
- { date: "28.01.19:", desc: "Add pipeline logic and multi arch." }
@@ -58,4 +59,4 @@ changelogs:
5859
- { date: "14.10.16:", desc: "Bump to pickup 2.10 release." }
5960
- { date: "14.10.16:", desc: "Add version layer information." }
6061
- { date: "11.09.16:", desc: "Add layer badges to README." }
61-
- { date: "31.08.16:", desc: "Initial Release." }
62+
- { date: "31.08.16:", desc: "Initial Release." }

0 commit comments

Comments
 (0)