Skip to content

Commit

Permalink
Merge pull request #26 from thelamer/master
Browse files Browse the repository at this point in the history
#25 add sqlite3 building on arm hosts
  • Loading branch information
aptalca authored May 16, 2019
2 parents ca98d84 + 1015e55 commit 96ef8de
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
11 changes: 10 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ ENV THELOUNGE_HOME="/config" \
NPM_CONFIG_LOGLEVEL="info"

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
gcc \
g++ \
make \
python-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
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
11 changes: 10 additions & 1 deletion Dockerfile.armhf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ ENV THELOUNGE_HOME="/config" \
NPM_CONFIG_LOGLEVEL="info"

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
gcc \
g++ \
make \
python-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,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.
Expand Down
3 changes: 2 additions & 1 deletion readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ app_setup_block: "
# changelog

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." }
Expand All @@ -58,4 +59,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 96ef8de

Please sign in to comment.