Skip to content

Commit

Permalink
fix: add node-gyp dependencies necessary to build sqlite3 (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
williamboman authored Aug 12, 2022
1 parent 034fc05 commit 51d9940
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/docker-image-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
dockerfile: [Dockerfile]
steps:
- name: Checkout
uses: actions/checkout@v1
Expand Down Expand Up @@ -47,5 +45,4 @@ jobs:
env:
PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7
DOCKER_REPOSITORY: thelounge/thelounge
DOCKERFILE: ${{ matrix.dockerfile }}
run: ./scripts/build-and-push.sh
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
exit $s
- name: Check for no ERROR logs
run: docker logs thelounge | grep "\[ERROR\]" && exit 1 || exit 0
run: docker logs thelounge 2>&1 | grep -vz "\[ERROR\]"

- name: Check for config.js to be created in the mounted host system directory
run: stat "${mount_dir}/config.js"
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

# Install thelounge.
ARG THELOUNGE_VERSION=4.3.1
RUN apk --update --no-cache --virtual build-deps add git && \
RUN apk --update --no-cache --virtual build-deps add python3 build-base git && \
ln -sf python3 /usr/bin/python && \
yarn --non-interactive --frozen-lockfile global add thelounge@${THELOUNGE_VERSION} && \
yarn --non-interactive cache clean && \
apk del build-deps
apk del --purge build-deps && \
rm -rf /root/.cache /tmp /usr/bin/python
2 changes: 1 addition & 1 deletion scripts/build-and-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ docker buildx build \
--platform "${PLATFORMS}" \
--tag "${DOCKER_REPOSITORY}:${TAG}" \
"${EXTRA_ARG[@]}" \
--file "${DOCKERFILE}" \
--file Dockerfile \
.

0 comments on commit 51d9940

Please sign in to comment.