Update docker build (works locally at least)

Author: evanbones

.dockerignore

@@ -1,22 +1,8 @@
-node_modules
-dist
-build
-.cache
-.yarn
-.pnp.*
-*.log
-.dockerignore
-.gitignore
-Dockerfile
-docker-compose.yml
-node_modules
-dist
-built
-log
-data.json
+node_modules/
+dist/
+built/
+.cache/
+.yarn/
 .env
-.vscode
-docs
-/public/css/spectre.min.css
-/public/css/spectre-exp.min.css
-/public/css/spectre-icons.min.css
+log/
+docs/

.env.example

@@ -27,16 +27,18 @@ LISTEN=tcp
 # Set to 0 if you want a system-allocated dynamic port. (32768–60999 on many Linux kernels, 49152–65535 per IANA recommendation)
 # If you set this, you must also set the LISTEN to "tcp".
 PORT=8080
-HOST=127.0.0.1
+HOST=0.0.0.0
 
 # See: http://expressjs.com/en/4x/api.html#trust.proxy.options.table
 TRUST_PROXY=false
 
 ###############################################################################
 ## DATABASE SETTINGS
 
-# PostgreSQL database connection string.
-DATABASE_URL=postgres://username:password@localhost:5432/database
+# PostgreSQL database connection string. 
+# If running via Docker Compose, the host should be "db" (the name of the postgres service).
+# Example: postgres://[user]:[password]@db:5432/[database]
+DATABASE_URL=postgres://postgres:supersecretpassword@db:5432/infernal_db
 
 # Determines if the database driver will log queries.
 DATABASE_LOG=false
@@ -45,4 +47,4 @@ DATABASE_LOG=false
 ## API KEYS
 
 # The API key for YouTube Data API v3.
-YOUTUBE_API_KEY=
+YOUTUBE_API_KEY=

Dockerfile

@@ -1,10 +1,38 @@
-FROM node:alpine AS build
+FROM node:22-alpine AS build
 
 WORKDIR /app
+
+COPY package.json yarn.lock ./
+COPY scripts ./scripts
+COPY patches ./patches
+RUN yarn install --frozen-lockfile --non-interactive
+
 COPY . .
 
-RUN yarn install --frozen-lockfile --non-interactive --verbose && \
-    yarn cache clean
 RUN yarn build:only
 
+FROM node:22-alpine AS production
+
+ENV NODE_ENV=production
+
+WORKDIR /app
+
+COPY package.json yarn.lock ./
+COPY scripts ./scripts
+COPY patches ./patches
+
+RUN yarn install --frozen-lockfile --non-interactive --production && \
+    yarn cache clean
+
+COPY --from=build /app/dist ./dist
+COPY --from=build /app/built ./built
+COPY --from=build /app/public ./public
+
+RUN addgroup -g 1001 -S nodejs && \
+    adduser -S nodeuser -u 1001 && \
+    chown -R nodeuser:nodejs /app
+USER nodeuser
+
+EXPOSE 8080
+
 ENTRYPOINT [ "yarn", "start" ]

deploy.sh

@@ -1,33 +1,13 @@
 #!/bin/sh
-# This script is run without arguments, in the deployment user's home directory.
-# This is a modified version of https://github.com/SwanX1/cernavskis.dev/blob/main/deploy.sh
-# It does not have administrative privileges.
 
 SERVICE_NAME="webapp"
-SERVICE_USER="github"
-GIT_REMOTE="https://github.com/infernalstudios.org.git"
 GIT_BRANCH="stable"
 
-# Check if the script is run as root
 if [ "$(id -u)" -eq 0 ]; then
   echo "This script must not be run as root."
   exit 1
 fi
 
-# Check if bun is installed
-if [ -z $(command -v yarn) ]; then
-  echo "yarn is not installed. Please install it first."
-  exit 1
-fi
-
-# Check if screen is installed
-if [ -z $(command -v screen) ]; then
-  echo "screen is not installed. Please install it first."
-  exit 1
-fi
-
-echo "Running as $(whoami) in $(pwd)."
-
 # Find service path
 if [ ! -f "$(pwd)/.service_paths" ]; then
   echo "Did you initialize the service using server-init.sh?: .service_paths not found."
@@ -36,60 +16,25 @@ fi
 
 SERVICE_PATH=$(cat $(pwd)/.service_paths | grep $SERVICE_NAME | cut -d' ' -f2)
 
-if [ -z "$SERVICE_PATH" ]; then
-  echo "Did you initialize the service using server-init.sh?: Service path not found in .service_paths."
-  exit 1
-fi
-
-if [ ! -d "$SERVICE_PATH" ]; then
-  echo "Did you initialize the service using server-init.sh?: Service path does not exist."
+if [ -z "$SERVICE_PATH" ] || [ ! -d "$SERVICE_PATH" ]; then
+  echo "Service path invalid or missing."
   exit 1
 fi
 
 cd $SERVICE_PATH
 
-# Checkout the latest commit on GIT_BRANCH
+# Checkout the latest commit
 git fetch origin -v
-if [ "$!" -ne 0 ]; then
-  echo "Failed to fetch."
-  exit 1
-fi
 git checkout origin/$GIT_BRANCH
-if [ "$!" -ne 0 ]; then
-  echo "Failed to checkout the latest commit."
-  exit 1
-fi
 
-# Install the dependencies
-yarn install --frozen-lockfile --non-interactive --verbose
+# Use Docker Compose
+echo "Building and starting Docker containers..."
+docker compose up -d --build
 
-if [ "$!" -ne 0 ]; then
-  echo "Failed to install the dependencies."
+if [ "$?" -ne 0 ]; then
+  echo "Docker compose failed to start the service."
   exit 1
 fi
 
-# We use build:only here, because we don't want to run any checks beforehand. Those are handled by GH Actions.
-yarn build:only
-
-if [ "$!" -ne 0 ]; then
-  echo "Failed to build, this should be unreachable."
-  echo "Ignoring this, since tsc and webpack transpiles everything regardless of errors."
-  echo "This should have been caught by GH Actions."
-fi
-
-if [ ! -z "$(screen -ls $SERVICE_NAME | grep $SERVICE_NAME)" ]; then
-  echo "Service is already running, stopping it."
-  screen -S $SERVICE_NAME -X quit
-  if [ "$!" -ne 0 ]; then
-    echo "Failed to stop the service."
-    exit 1
-  fi
-fi
-
-echo "Starting the service."
-screen -dmqS $SERVICE_NAME yarn start
-
-if [ "$!" -ne 0 ]; then
-  echo "Failed to start the service."
-  exit 1
-fi
+echo "Deployment successful."
+docker image prune -f

docker-compose.yml

@@ -1,9 +1,41 @@
 services:
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: app
+      build:
+        context: .
+        dockerfile: Dockerfile
+      container_name: app
+      restart: unless-stopped
+      ports:
+        - "8080:8080"
+      volumes:
+        - ./.env:/app/.env:ro
+        - ./log:/app/log 
+      depends_on:
+        db:
+          condition: service_healthy
+      environment:
+        - NODE_ENV=production
+        - LISTEN=tcp
+        - HOST=0.0.0.0
+        - DATABASE_URL=postgres://postgres:supersecretpassword@db:5432/infernal_db
+
+  db:
+    image: postgres:15-alpine
+    container_name: app_db
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: supersecretpassword
+      POSTGRES_DB: infernal_db
+    ports:
+      - "5432:5432"
     volumes:
-      - ./.env:/app/.env:ro
-    network_mode: "host"
+      - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  pgdata:

server-init.sh

@@ -47,6 +47,6 @@ git checkout origin/$GIT_BRANCH
 
 chown -R $SERVICE_USER $SERVICE_PATH
 
-if [ -z $(command -v screen) ]; then
-  echo "screen is not installed. Please install it before deployment."
+if [ -z $(command -v docker) ]; then
+  echo "docker is not installed. Please install Docker and Docker Compose before deployment."
 fi