Skip to content

Commit

Permalink
Fixing node 16 support and adding arm/v7.
Browse files Browse the repository at this point in the history
  • Loading branch information
flosoft committed Aug 20, 2021
1 parent caca885 commit 6c01fd6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
with:
context: ./joplin/
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
Expand Down
15 changes: 10 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
# https://versatile.nl/blog/deploying-lerna-web-apps-with-docker

FROM node:16-buster
FROM node:16-bullseye
#FROM ubuntu:20.10

RUN apt-get update
#RUN apt-get update
#python3 as sqlite3 is failing to build
# https://github.com/mapbox/node-sqlite3/issues/1413
#RUN apt-get --yes install nodejs npm git python3
RUN apt-get --yes install git python3
RUN ln -sf python3 /usr/bin/python
RUN npm config set python "$(which python3)"
#RUN apt-get --yes install git python3
RUN apt-get update \
&& apt-get install -y \
python \
&& rm -rf /var/lib/apt/lists/*

#RUN ln -sf python3 /usr/bin/python
#RUN npm config set python "$(which python3)"

ARG user=joplin

Expand Down

0 comments on commit 6c01fd6

Please sign in to comment.