Merge pull request #13 from ministryofjustice/dep-updates

Update and remove unused npm deps. Add prod docker-compose for local testing. Add access token

.dockerignore

@@ -1,3 +1,4 @@
 *
 !conf
+conf/node/node_modules
 !src

.github/workflows/deploy.yml

@@ -32,6 +32,7 @@ jobs:
           # AWS_CLOUDFRONT_PUBLIC_KEY_EXPIRING: "${{ secrets.AWS_CLOUDFRONT_PUBLIC_KEY_B }}"
           BASIC_AUTH_USER: ${{ secrets.BASIC_AUTH_USER }}
           BASIC_AUTH_PASS: ${{ secrets.BASIC_AUTH_PASS }}
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: |
           ## - - - - - - - - - -
           ## CloudFront  - - - -

Dockerfile

@@ -1,8 +1,10 @@
-FROM nginxinc/nginx-unprivileged
+FROM nginxinc/nginx-unprivileged AS base
 
 USER root
 
-RUN apt-get update && apt-get -y install -qq libhttrack-dev httrack nodejs npm cron unzip curl
+RUN apt-get update && \
+    apt-get -y install -qq \
+    libhttrack-dev httrack nodejs npm cron unzip curl
 
 # Get AWS CLI V2
 RUN set -eux; \
@@ -29,11 +31,9 @@ RUN set -eux; \
     ./aws/install; \
     rm awscli.zip;
 
-## nginx user uid=101
-COPY --chown=101:101 conf/node /usr/local/bin
-
 ARG user=archiver
 ARG uid=1001
+
 RUN addgroup --gid ${uid} ${user} && \
     adduser --disabled-login --disabled-password --ingroup ${user} --home /${user} --gecos "${user} user" --shell /bin/bash --uid ${uid} ${user} && \
     usermod -a -G ${user} nginx && \
@@ -42,10 +42,12 @@ RUN addgroup --gid ${uid} ${user} && \
     echo "${user}" > /etc/cron.allow
 
 COPY src/ /usr/share/nginx/html
+COPY conf/node /usr/local/bin/node
 COPY conf/nginx.conf /etc/nginx/conf.d/default.conf
-COPY conf/entrypoint/ /docker-entrypoint.d
 COPY conf/s3-sync.sh /usr/bin/s3sync
 COPY conf/httrack /usr/local/bin/httrack
+## -> Copy common entrypoint scripts (for both dev & prod images).
+COPY conf/entrypoint/setup-credentials.sh conf/entrypoint/start-cron.sh /docker-entrypoint.d/
 
 ## -> make init scripts executable
 RUN chmod -R +x /docker-entrypoint.d/ && \
@@ -62,6 +64,42 @@ RUN echo "*/10 * * * * /usr/bin/s3-sync >> /archiver/cron.log 2>&1" >> /etc/cron
 RUN touch /${user}/cron.log && \
     chmod 644 /${user}/cron.log
 
-RUN apt remove -y unzip curl
+
+
+# Create a development image, from the base image.
+# The image is used for local development only.
+FROM base AS dev
+
+WORKDIR /usr/local/bin/node
+
+COPY conf/entrypoint/start-node-dev.sh /docker-entrypoint.d/
+RUN chmod -R +x /docker-entrypoint.d/start-node-dev.sh
+
+RUN mkdir /usr/local/bin/node/node_modules && \
+    chown -R ${uid}:${uid} /usr/local/bin/node
+
+ENV NODE_ENV=development
+
+USER ${uid}
+
+
+
+# Create a production image, from the base image.
+# The image is used for deployment, and can be run locally.
+FROM base AS build-prod
+
+WORKDIR /usr/local/bin/node
+
+COPY conf/entrypoint/start-node-prod.sh /docker-entrypoint.d/
+RUN chmod -R +x /docker-entrypoint.d/start-node-prod.sh
+
+# Install the node modules.
+RUN npm ci
+
+# Change the environment to production for runtime.
+ENV NODE_ENV=production
+
+# Remove the npm package manager.
+RUN apt remove -y curl npm unzip
 
 USER ${uid}

Makefile

@@ -23,10 +23,7 @@ dory:
 sync:
 	@docker compose exec spider s3sync
 
-build:
-	bin/build.sh
-
-launch: build
+launch:
 	@bin/launch.sh
 	@echo "\n Intranet spider available here: http://spider.intranet.docker/\n"
 	@docker compose logs -f spider

conf/entrypoint/start-node-dev.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+DOTS="\n \033[0;32m***\033[0m"
+
+echo -e "${DOTS} ${DOTS} Grabbing dependencies for node... ${DOTS}\n"
+
+# Install dependencies.
+npm install
+
+echo -e "${DOTS} ${DOTS} Running dev server ${DOTS}\n"
+
+# Start the server in watch mode with the `dev` script.
+npm run dev &

conf/entrypoint/start-node-prod.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+nohup node /usr/local/bin/node/process.js &
+