From 354fafe8b3d9212a9a0c4d68ec90b694f60c7faa Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Sat, 28 Nov 2020 05:24:49 -0500
Subject: [PATCH] bump npm and python version in image

---
 .dockerignore | 6 ++++++
 Dockerfile    | 6 +++---
 bin/build.sh  | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 0a7034e1..8cebf35e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,8 @@
 *.pyc
 __pycache__/
 .mypy_cache/
+.pytest_cache/
+.github/
 
 venv/
 .venv/
@@ -10,6 +12,10 @@ venv/
 
 build/
 dist/
+pip_dist/
+!pip_dist/archivebox.egg-info/requires.txt
+brew_dist/
+assets/
 
 data/
 output/
diff --git a/Dockerfile b/Dockerfile
index d7b843c9..33d4a488 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@
 #     docker run -v "$PWD/data":/data -it archivebox manage createsuperuser
 #     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" \
     maintainer="Nick Sweeting <archivebox-docker@sweeting.me>" \
@@ -52,7 +52,7 @@ RUN apt-get update -qq \
 
 # Install Node environment
 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 install -qq -y --no-install-recommends \
         nodejs \
@@ -62,7 +62,7 @@ RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
 WORKDIR "$NODE_DIR"
 ENV PATH="${PATH}:$NODE_DIR/node_modules/.bin" \
     npm_config_loglevel=error
-RUN npm install -g npm
+# RUN npm install -g npm
 ADD ./package.json ./package.json
 ADD ./package-lock.json ./package-lock.json
 RUN npm ci
diff --git a/bin/build.sh b/bin/build.sh
index 6c23ea11..b5d48115 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -16,6 +16,7 @@ cd "$REPO_DIR"
 
 # pipenv install --dev
 
+# the order matters
 ./bin/build_docs.sh
 ./bin/build_pip.sh
 ./bin/build_deb.sh