From 58600b945e510123b7b8e5b23dd3a0c25343e9c2 Mon Sep 17 00:00:00 2001 From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:30:25 -0400 Subject: [PATCH 1/4] chore: update Docker configuration --- .dockerignore | 7 +++--- .gitignore | 1 + Dockerfile | 55 ++++++++++++++++++++++++++++++++++++-------- docker/entrypoint.sh | 12 ---------- 4 files changed, 51 insertions(+), 24 deletions(-) delete mode 100644 docker/entrypoint.sh diff --git a/.dockerignore b/.dockerignore index 4d2946ae..aa233d65 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,6 @@ .git +.env node_modules -config.json -certs -src/logs +dist +logs +uploads diff --git a/.gitignore b/.gitignore index 8db21eb3..995ce859 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules config.json certs src/logs +uploads diff --git a/Dockerfile b/Dockerfile index be1b7af3..7f2cada4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,52 @@ -FROM node:18-alpine +# syntax=docker/dockerfile:1 -RUN apk add --no-cache python3 make gcc g++ -WORKDIR /app +ARG app_dir="/home/node/app" -COPY "docker/entrypoint.sh" ./ -COPY package*.json ./ -RUN npm install +# * Base Node.js image +FROM node:20-alpine AS base +ARG app_dir +WORKDIR ${app_dir} -COPY . ./ -VOLUME [ "/app/config.json", "/app/certs" ] +# * Installing production dependencies +FROM base AS dependencies -CMD ["sh", "entrypoint.sh"] +RUN --mount=type=bind,source=package.json,target=package.json \ + --mount=type=bind,source=package-lock.json,target=package-lock.json \ + --mount=type=cache,target=/root/.npm \ + npm ci --omit=dev + + +# * Installing development dependencies and building the application +FROM base AS build + +RUN --mount=type=bind,source=package.json,target=package.json \ + --mount=type=bind,source=package-lock.json,target=package-lock.json \ + --mount=type=cache,target=/root/.npm \ + npm ci + +COPY . . +# TODO: re-enable after TypeScript migration +#RUN npm run build + + +# * Running the final application +FROM base AS final +ARG app_dir + +RUN mkdir -p ${app_dir}/src/logs && chown node:node ${app_dir}/src/logs \ + && mkdir -p ${app_dir}/uploads && chown node:node ${app_dir}/uploads + +ENV NODE_ENV=production +USER node + +COPY package.json . + +COPY --from=dependencies ${app_dir}/node_modules ${app_dir}/node_modules +COPY --from=build ${app_dir} ${app_dir} + +# TODO: change back after TypeScript migration +#COPY --from=build ${app_dir}/dist ${app_dir}/dist + +CMD ["node", "."] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh deleted file mode 100644 index 8580413b..00000000 --- a/docker/entrypoint.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -files='config.json certs/access/private.pem certs/access/aes.key' - -for file in $files; do - if [ ! -f $file ]; then - echo "$PWD/$file file does not exist. Please mount and try again." - exit 1 - fi -done - -exec node src/server.js From 9d0a5255dc3df515e73ea56511f8117218672760 Mon Sep 17 00:00:00 2001 From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:30:40 -0400 Subject: [PATCH 2/4] feat: create Docker build and publish action --- .github/workflows/docker.yml | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 00000000..9e1ef9c4 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,47 @@ +name: Build and Publish Docker Image + +on: + push: + pull_request: + workflow_dispatch: + +jobs: + build-publish: + env: + SHOULD_PUSH_IMAGE: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev')) || github.event_name == 'workflow_dispatch' }} + runs-on: ubuntu-latest + + steps: + - name: Set up QEMU for Docker + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log into the Docker container registry + if: ${{ env.SHOULD_PUSH_IMAGE == 'true' }} + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ github.repository }} + tags: | + type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=edge,enable=${{ github.ref == 'refs/heads/dev' }} + type=sha + + - name: Build and push Docker image + id: build-and-push + uses: docker/build-push-action@v6 + with: + platforms: linux/amd64,linux/arm64 + push: ${{ env.SHOULD_PUSH_IMAGE }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max From 663fcf221a84d5ed620f446f74a56a4e2e58c5b0 Mon Sep 17 00:00:00 2001 From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:31:44 -0400 Subject: [PATCH 3/4] fix: exit server on SIGTERM --- src/server.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server.js b/src/server.js index be659074..eb628fbe 100644 --- a/src/server.js +++ b/src/server.js @@ -1,6 +1,10 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable @typescript-eslint/no-var-requires */ process.title = 'Pretendo - Juxt-Web'; +process.on('SIGTERM', () => { + process.exit(0); +}); + const express = require('express'); const morgan = require('morgan'); const cookieParser = require('cookie-parser'); From 3cc53c603acaded6f56efe51282585998710dd2b Mon Sep 17 00:00:00 2001 From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com> Date: Tue, 2 Jul 2024 16:38:45 -0400 Subject: [PATCH 4/4] fix: correctly create redis client url --- src/redisCache.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redisCache.js b/src/redisCache.js index b4f3b7a1..1f7463cc 100644 --- a/src/redisCache.js +++ b/src/redisCache.js @@ -5,7 +5,9 @@ const logger = require('./logger'); const config = require('../config.json'); const { host, port } = config.redis; -const redisClient = redis.createClient({ host, port }); +const redisClient = redis.createClient({ + url: `redis://${host}:${port}` +}); redisClient.on('error', (error) => { logger.error(error);