modified docker configs to streamline deplpoyment process

Author: andrew-s28

.github/workflows/build-and-deploy.yaml

@@ -42,6 +42,20 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           port: ${{ secrets.SSH_PORT }}
           passphrase: ${{ secrets.SSH_PASSPHRASE }}
-          source: "./.output,./src,./public,./mdx,./*"
+          source: "./.output,./src,./public,./mdx,./package.json,./package-lock.json,./nginx"
           target: "~/sourcedepth.com/"
           overwrite: true
+      - name: Build and restart Docker containers
+        uses: appleboy/ssh-action@v1
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          passphrase: ${{ secrets.SSH_PASSPHRASE }}
+          script: |
+            cd ~/sourcedepth.com
+            docker-compose down
+            docker-compose build --pull --no-cache
+            docker-compose up -d
+            docker system prune -f

.gitignore

@@ -45,4 +45,5 @@ sketch
 .nitro
 .tanstack
 _old*
-.vscode
+.vscode
+certbot/

Dockerfile

@@ -4,9 +4,15 @@ ARG NODE_VERSION=22.13.1
 
 FROM node:${NODE_VERSION}-alpine as base
 WORKDIR /usr/src/app
-EXPOSE 3000
 
 FROM base as prod
+COPY package.json .
+COPY package-lock.json .
+RUN npm ci --omit=dev
+EXPOSE 3000
+
 USER node
-COPY . .
+COPY ./public ./public
+COPY ./mdx ./mdx
+COPY ./.output ./.output
 CMD node .output/server/index.mjs

docker-compose.yml

@@ -5,18 +5,19 @@ services:
     ports:
       - 3000:3000
     environment:
-     NODE_ENV: production
+      NODE_ENV: production
     volumes:
-      - ./.output:/usr/src/app/.output
       - ./mdx:/usr/src/app/mdx
       - ./public:/usr/src/app/public
+      - ./.output:/usr/src/app/.output
+      - ./package.json:/usr/src/app/package.json
+      - ./package-lock.json:/usr/src/app/package-lock.json
   nginx:
     depends_on:
       - server
-    build:
-      ./nginx
+    image: nginx:latest
     volumes:
-      - ./nginx/conf/:/etc/nginx/conf.d/:ro
+      - ./nginx/nginx.conf:/etc/nginx/conf.d/nginx.conf:ro
       - ./certbot/www/:/var/www/certbot/:ro
       - ./certbot/conf/:/etc/nginx/ssl/:ro
     ports:
@@ -27,6 +28,5 @@ services:
     image: certbot/certbot:latest
     volumes:
       - ./certbot/www/:/var/www/certbot/:rw
-      - ../web/certbot/conf/:/etc/letsencrypt/:rw
-    command: certonly --webroot -w /var/www/certbot/ --email [email protected] -d sourcedepth.com --agree-tos --keep-until-expiring
-    restart: always
+      - ./certbot/conf/:/etc/letsencrypt/:rw
+    command: certonly --webroot -w /var/www/certbot/ --email [email protected] -d sourcedepth.com --agree-tos --keep-until-expiring