Merge pull request #66 from csalmeida/docker

Improves Dockerfile Setup

Author: csalmeida

.dockerignore

@@ -3,6 +3,8 @@ node_modules
 docs
 screenshots
 .nvmrc
+.git
+.github
 .gitignore
 .gitattributes
 .nojekyll
@@ -11,4 +13,30 @@ README.md
 
 # Docker
 docker
-docker-compose.yml
+docker-compose.yml
+.dockerignore
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

README.md

@@ -137,6 +137,20 @@ npm run build
 1. [Install Docker](https://docs.docker.com/engine/install/). For MacOS and Windows, [Docker Desktop](https://docs.docker.com/engine/install/#desktop) is recommended instead.
 1. Run `docker compose up -d`. This will run the development environment.
 
+Rebuild and run Docker container from a clean slate with with:
+
+```bash
+# Change directory into the project.
+cd protonmail-themes
+```
+
+```bash
+docker compose rm &&
+docker compose pull &&
+docker compose build --no-cache &&
+docker compose up -d --force-recreate
+```
+
 **Additional notes:**
 
 - To examine the container run `docker ps`.

docker/node.dockerfile

@@ -1,18 +1,24 @@
-# This image makes use of a Node image running on Linux Alpine
-FROM node:15-alpine3.13
+# This image makes use of a Node image running on Linux Alpine (latest versions of both)
+# Using digest SHA256 increases security
+FROM node:lts-alpine@sha256:8d5d490d1e18c9069b34b4a57df1cb3b8cd1b756f2f63f7b8240f39d7c01c402
+
+# Adds a package to act as PID 1 so that Node doesn't take that place.
+# Node wasn't built to run as PID 1 and avoiding it prevents unexpected behaviour.
+RUN apk add dumb-init
 
 # A work directory is required to be used by npm install
 WORKDIR /var/projects/protonmail-themes
 
 # Copy all project files to the container
 # Files in the location of this file are copied to WORKDIR in the container
-COPY . .
-
-# Makes sure npm is up to date otherwise install dependencies attempts will fail
-RUN npm install -g npm
+# Scopes permissions to user node instead of root.
+COPY --chown=node:node . .
 
 # Install dependencies
-RUN npm install
+RUN npm ci
+
+# Switches user from root to node.
+USER node
 
 # The process this container should run
-CMD ["npm", "start"]
+CMD ["dumb-init", "npm", "start"]