Refactor/use docker swarm

.dockerignore

@@ -0,0 +1,8 @@
+.env
+.env.local
+Dockerfile
+.dockerignore
+node_modules
+npm-debug.log
+README.md
+.git

.github/workflows/deploy-to-vps.yaml

@@ -5,9 +5,9 @@ name: CI/CD For the Deployment
 # Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    branches:
-      - main
+  # push:
+  #   branches:
+  #     - main
 
   # Allows you to run this workflow manually from the Actions tab+1
   workflow_dispatch:

.github/workflows/docker-deploy-dev.yaml

@@ -0,0 +1,93 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI/CD For docker deploy
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  pull_request:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build-push-docker:
+    runs-on: ubuntu-latest
+    environment: dev
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Get github branch name
+        id: get-github-ref
+        run: |
+          echo "github_ref=${{ github.head_ref }}" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Cache build output
+        id: next-build-cache
+        uses: actions/cache@v3
+        with:
+          path: .next
+          key: ${{ runner.os }}-next-build-cache-${{ steps.get-github-ref.outputs.github_ref }}
+          restore-keys: |
+            ${{ runner.os }}-next-build-cache-${{ steps.get-github-ref.outputs.github_ref }}
+
+      - uses: whoan/docker-build-with-cache-action@v5
+        with:
+          username: fredkiss3
+          password: ${{ secrets.DCR_PASSWD }}
+          image_name: gh-next
+          image_tag: dev
+          push_git_tag: true
+          registry: dcr.fredkiss.dev
+          dockerfile: docker/Dockerfile.prod
+          context: .
+          build_extra_args: "--build-arg NEXT_PUBLIC_VERCEL_URL=gh-dev.fredkiss.dev --build-arg GITHUB_REDIRECT_URI=https://gh-dev.fredkiss.dev/api/auth/callback --build-arg SESSION_SECRET=${{ secrets.SESSION_SECRET }} --build-arg DATABASE_URL=${{ secrets.POSTGRES_DB_URL }} --build-arg GITHUB_CLIENT_ID=${{ secrets.GH_CLIENT_ID }} --build-arg GITHUB_SECRET=${{ secrets.GH_SECRET }} --build-arg GITHUB_PERSONAL_ACCESS_TOKEN=${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} --build-arg REDIS_HTTP_USERNAME=${{ secrets.REDIS_HTTP_USERNAME }} --build-arg REDIS_HTTP_PASSWORD=${{ secrets.REDIS_HTTP_PASSWORD }} --build-arg KV_PREFIX=__gh_next__cache_dev_"
+
+      - name: copy build cache
+        run: |
+          ls -l ./.next/cache 2> /dev/null || true
+          echo ${{ secrets.DCR_PASSWD }} | docker login  --username=fredkiss3 --password-stdin dcr.fredkiss.dev
+          docker pull dcr.fredkiss.dev/gh-next:dev
+          CONTAINER_ID=$(docker create dcr.fredkiss.dev/gh-next:dev)
+          mkdir -p .next/
+          docker cp ${CONTAINER_ID}:/app/.next/cache .next/
+          docker rm ${CONTAINER_ID}
+          ls -l ./.next/cache
+
+  deploy:
+    # The type of runner that the job will run on
+    needs:
+      - build-push-docker
+    runs-on: ubuntu-latest
+    environment: dev
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_SERVER_KEY }}
+          name: id_rsa # optional
+          known_hosts: ${{ secrets.KNOWN_HOSTS }}
+
+      - name: Restart docker-stack
+        run: |
+          scp -P $DEPLOY_PORT ./docker/docker-stack.dev.yaml $DEPLOY_USER@$DEPLOY_DOMAIN:$DCR_DEPLOY_DIR/docker-stack.dev.yaml
+          ssh -p $DEPLOY_PORT $DEPLOY_USER@$DEPLOY_DOMAIN " 
+          cd $DCR_DEPLOY_DIR
+          echo updating docker services for dev environment...
+          echo ${{ secrets.DCR_PASSWD }} | docker login  --username=fredkiss3 --password-stdin dcr.fredkiss.dev
+          docker stack deploy --with-registry-auth --compose-file ./docker-stack.dev.yaml gh-stack-dev
+          echo services updated succesfully ✅
+          "
+        env:
+          DCR_DEPLOY_DIR: ${{ secrets.DCR_DEPLOY_DIR }}
+          DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
+          DEPLOY_DOMAIN: ${{ secrets.DEPLOY_DOMAIN }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DCR_PASSWD: ${{ secrets.DCR_PASSWD }}
+          DCR_USER: ${{ secrets.DCR_USER }}

.github/workflows/docker-deploy-prod.yaml

@@ -0,0 +1,95 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI/CD For docker deploy
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches:
+      - main
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build-push-docker:
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Get github branch name
+        id: get-github-ref
+        run: |
+          echo "github_ref=${{ github.head_ref }}" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Cache build output
+        id: next-build-cache
+        uses: actions/cache@v3
+        with:
+          path: .next
+          key: ${{ runner.os }}-next-build-cache-${{ steps.get-github-ref.outputs.github_ref }}
+          restore-keys: |
+            ${{ runner.os }}-next-build-cache-${{ steps.get-github-ref.outputs.github_ref }}
+
+      - uses: whoan/docker-build-with-cache-action@v5
+        with:
+          username: fredkiss3
+          password: ${{ secrets.DCR_PASSWD }}
+          image_name: gh-next
+          image_tag: latest
+          push_git_tag: true
+          registry: dcr.fredkiss.dev
+          dockerfile: docker/Dockerfile.prod
+          context: .
+          build_extra_args: "--build-arg NEXT_PUBLIC_VERCEL_URL=gh.fredkiss.dev --build-arg GITHUB_REDIRECT_URI=https://gh.fredkiss.dev/api/auth/callback --build-arg SESSION_SECRET=${{ secrets.SESSION_SECRET }} --build-arg DATABASE_URL=${{ secrets.POSTGRES_DB_URL }} --build-arg GITHUB_CLIENT_ID=${{ secrets.GH_CLIENT_ID }} --build-arg GITHUB_SECRET=${{ secrets.GH_SECRET }} --build-arg GITHUB_PERSONAL_ACCESS_TOKEN=${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} --build-arg REDIS_HTTP_USERNAME=${{ secrets.REDIS_HTTP_USERNAME }} --build-arg REDIS_HTTP_PASSWORD=${{ secrets.REDIS_HTTP_PASSWORD }} --build-arg KV_PREFIX=__gh_next__cache_prod_"
+
+      - name: copy build cache
+        run: |
+          ls -l ./.next/cache 2> /dev/null || true
+          echo ${{ secrets.DCR_PASSWD }} | docker login  --username=fredkiss3 --password-stdin dcr.fredkiss.dev
+          docker pull dcr.fredkiss.dev/gh-next:latest
+          CONTAINER_ID=$(docker create dcr.fredkiss.dev/gh-next:latest)
+          mkdir -p .next/
+          docker cp ${CONTAINER_ID}:/app/.next/cache .next/
+          docker rm ${CONTAINER_ID}
+          ls -l ./.next/cache
+
+  deploy:
+    # The type of runner that the job will run on
+    needs:
+      - build-push-docker
+    runs-on: ubuntu-latest
+    environment: dev
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_SERVER_KEY }}
+          name: id_rsa # optional
+          known_hosts: ${{ secrets.KNOWN_HOSTS }}
+
+      - name: Restart docker-stack
+        run: |
+          scp -P $DEPLOY_PORT ./docker/docker-stack.prod.yaml $DEPLOY_USER@$DEPLOY_DOMAIN:$DCR_DEPLOY_DIR/docker-stack.prod.yaml
+          ssh -p $DEPLOY_PORT $DEPLOY_USER@$DEPLOY_DOMAIN " 
+          cd $DCR_DEPLOY_DIR
+          echo updating docker services for dev environment...
+          echo ${{ secrets.DCR_PASSWD }} | docker login  --username=fredkiss3 --password-stdin dcr.fredkiss.dev
+          docker stack deploy --with-registry-auth --compose-file ./docker-stack.prod.yaml gh-stack-prod
+          echo services updated succesfully ✅
+          "
+        env:
+          DCR_DEPLOY_DIR: ${{ secrets.DCR_DEPLOY_DIR }}
+          DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
+          DEPLOY_DOMAIN: ${{ secrets.DEPLOY_DOMAIN }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DCR_PASSWD: ${{ secrets.DCR_PASSWD }}
+          DCR_USER: ${{ secrets.DCR_USER }}

.vscode/settings.json

@@ -1,5 +1,8 @@
 {
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.defaultFormatter": "biomejs.biome"
+  "editor.defaultFormatter": "biomejs.biome",
+  "[typescript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  }
 }

dc-build-local.sh

@@ -0,0 +1,4 @@
+while read -r line; do
+    build_args="$build_args --build-arg $line"
+done < .env.docker.local
+docker build $build_args -t dcr.fredkiss.dev/gh-next:latest -f docker/Dockerfile.dev . 

docker/Dockerfile.dev

@@ -0,0 +1,110 @@
+##### DEPENDENCIES
+
+FROM node:20-alpine3.19 AS deps
+RUN apk add --no-cache libc6-compat 
+RUN apk update && apk upgrade openssl
+WORKDIR /app
+
+# Install dependencies based on the preferred package manager
+
+COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml\* ./
+COPY ./patches ./patches
+
+RUN \
+ if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
+ elif [ -f package-lock.json ]; then npm ci; \
+ elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm install --shamefully-hoist --strict-peer-dependencies=false --frozen-lockfile; \
+ else echo "Lockfile not found." && exit 1; \
+ fi
+
+##### BUILDER
+
+FROM node:20-alpine3.19 AS builder
+
+ARG SESSION_SECRET
+ARG DATABASE_URL
+ARG GITHUB_CLIENT_ID
+ARG GITHUB_SECRET
+ARG GITHUB_PERSONAL_ACCESS_TOKEN
+ARG KV_PREFIX
+ARG NEXT_PUBLIC_VERCEL_URL="localhost:3000"
+ARG REDIS_HTTP_URL="http://webdis:7379"
+ARG REDIS_HTTP_USERNAME="user"
+ARG REDIS_HTTP_PASSWORD="password"
+ARG GITHUB_REDIRECT_URI="http://localhost:3000/api/auth/callback"
+
+ENV NEXT_PUBLIC_VERCEL_URL=$NEXT_PUBLIC_VERCEL_URL
+ENV SESSION_SECRET=$SESSION_SECRET
+ENV DATABASE_URL=$DATABASE_URL
+ENV GITHUB_CLIENT_ID=$GITHUB_CLIENT_ID
+ENV GITHUB_REDIRECT_URI=$GITHUB_REDIRECT_URI
+ENV GITHUB_SECRET=$GITHUB_SECRET
+ENV GITHUB_PERSONAL_ACCESS_TOKEN=$GITHUB_PERSONAL_ACCESS_TOKEN
+ENV REDIS_HTTP_URL=$REDIS_HTTP_URL
+ENV REDIS_HTTP_USERNAME=$REDIS_HTTP_USERNAME
+ENV REDIS_HTTP_PASSWORD=$REDIS_HTTP_PASSWORD
+ENV KV_PREFIX=$KV_PREFIX
+
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN \
+ if [ -f yarn.lock ]; then yarn build; \
+ elif [ -f package-lock.json ]; then npm run build; \
+ elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm run build; \
+ else echo "Lockfile not found." && exit 1; \
+ fi
+
+##### RUNNER
+
+FROM node:20-alpine3.19 AS runner
+WORKDIR /app
+
+ARG SESSION_SECRET
+ARG DATABASE_URL
+ARG GITHUB_CLIENT_ID
+ARG GITHUB_SECRET
+ARG GITHUB_PERSONAL_ACCESS_TOKEN
+ARG KV_PREFIX
+ARG NEXT_PUBLIC_VERCEL_URL="localhost:3000"
+ARG REDIS_HTTP_URL="http://webdis:7379"
+ARG REDIS_HTTP_USERNAME="user"
+ARG REDIS_HTTP_PASSWORD="password"
+ARG GITHUB_REDIRECT_URI="http://localhost:3000/api/auth/callback"
+
+ENV NEXT_PUBLIC_VERCEL_URL=$NEXT_PUBLIC_VERCEL_URL
+ENV SESSION_SECRET=$SESSION_SECRET
+ENV DATABASE_URL=$DATABASE_URL
+ENV GITHUB_CLIENT_ID=$GITHUB_CLIENT_ID
+ENV GITHUB_REDIRECT_URI=$GITHUB_REDIRECT_URI
+ENV GITHUB_SECRET=$GITHUB_SECRET
+ENV GITHUB_PERSONAL_ACCESS_TOKEN=$GITHUB_PERSONAL_ACCESS_TOKEN
+ENV REDIS_HTTP_URL=$REDIS_HTTP_URL
+ENV REDIS_HTTP_USERNAME=$REDIS_HTTP_USERNAME
+ENV REDIS_HTTP_PASSWORD=$REDIS_HTTP_PASSWORD
+ENV KV_PREFIX=$KV_PREFIX
+
+ENV NODE_ENV production
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+COPY --from=builder /app/next.config.js ./
+COPY --from=builder /app/public ./public
+COPY --from=builder /app/package.json ./package.json
+
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+EXPOSE 3000
+ENV PORT 3000
+ENV NODE_ENV=production
+ENV HOSTNAME 0.0.0.0
+
+CMD [ "node", "server.js"]