CodeMirror/ArchiveBox
1
0
Fork 0
mirror of synced 2024-04-28 17:42:35 +12:00
Code Issues Projects Releases Wiki Activity

bump npm and python version in image

Browse source
This commit is contained in:
Nick Sweeting 2020-11-28 05:24:49 -05:00
parent ee09725cf1
commit 354fafe8b3
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.dockerignore
View file

@ -3,6 +3,8 @@
*.pyc *.pyc
__pycache__/ __pycache__/
.mypy_cache/ .mypy_cache/
.pytest_cache/
.github/
venv/ venv/
.venv/ .venv/
@ -10,6 +12,10 @@ venv/
build/ build/
dist/ dist/
pip_dist/
!pip_dist/archivebox.egg-info/requires.txt
brew_dist/
assets/
data/ data/
output/ output/

6
Dockerfile
View file

@ -7,7 +7,7 @@
# docker run -v "$PWD/data":/data -it archivebox manage createsuperuser # docker run -v "$PWD/data":/data -it archivebox manage createsuperuser
# docker run -v "$PWD/data":/data -p 8000:8000 archivebox server # docker run -v "$PWD/data":/data -p 8000:8000 archivebox server
FROM python:3.8-slim-buster FROM python:3.9-slim-buster
LABEL name="archivebox" \ LABEL name="archivebox" \
maintainer="Nick Sweeting <archivebox-docker@sweeting.me>" \ maintainer="Nick Sweeting <archivebox-docker@sweeting.me>" \
@ -52,7 +52,7 @@ RUN apt-get update -qq \
# Install Node environment # Install Node environment
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo 'deb https://deb.nodesource.com/node_14.x buster main' >> /etc/apt/sources.list \ && echo 'deb https://deb.nodesource.com/node_15.x buster main' >> /etc/apt/sources.list \
&& apt-get update -qq \ && apt-get update -qq \
&& apt-get install -qq -y --no-install-recommends \ && apt-get install -qq -y --no-install-recommends \
nodejs \ nodejs \
@ -62,7 +62,7 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
WORKDIR "$NODE_DIR" WORKDIR "$NODE_DIR"
ENV PATH="${PATH}:$NODE_DIR/node_modules/.bin" \ ENV PATH="${PATH}:$NODE_DIR/node_modules/.bin" \
npm_config_loglevel=error npm_config_loglevel=error
RUN npm install -g npm # RUN npm install -g npm
ADD ./package.json ./package.json ADD ./package.json ./package.json
ADD ./package-lock.json ./package-lock.json ADD ./package-lock.json ./package-lock.json
RUN npm ci RUN npm ci

1
bin/build.sh
View file

@ -16,6 +16,7 @@ cd "$REPO_DIR"
# pipenv install --dev # pipenv install --dev
# the order matters
./bin/build_docs.sh ./bin/build_docs.sh
./bin/build_pip.sh ./bin/build_pip.sh
./bin/build_deb.sh ./bin/build_deb.sh