npm

.github/workflows/docker-build-test.yml

@@ -38,4 +38,10 @@ jobs:
         context: .
         push: false
         tags: marcpartensky/website:latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache

Dockerfile

@@ -1,23 +1,25 @@
-FROM python:3.7.12
-# ARG timestamp
-# ARG commit
+FROM marcpartensky/paru:latest as builder
+RUN paru -Syyyu --noconfirm python37 python-pipenv npm make
+COPY . /app
+RUN pipenv update
+RUN pipenv run ./manage.py collectstatic --noinput
+RUN npm install -g npm@latest
+RUN npm install
+
+FROM marcpartensky/paru:latest
 LABEL maintainer="marc.partensky@gmail.com"
 LABEL image="https://hub.docker.com/r/marcpartensky/website"
 LABEL source="https://github.com/marcpartensky/website"
 LABEL link="https://marcpartensky.com"
+RUN paru -Syyyu --noconfirm python37 npm
+# ARG timestamp
+# ARG commit
 # LABEL build.timestamp=timestamp
 # LABEL build.commit=commit
 
-COPY . /app
+COPY --from=builder /app /app
 WORKDIR /app
 
-RUN apt-get update
-
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
-RUN apt-get install -y nodejs
-RUN npm install -g npm@latest
-RUN npm install
-
 # No .pyo and easier debugging
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1