From 056693a1f5123f7b8844fc545439913d30afae3d Mon Sep 17 00:00:00 2001
From: Jorge Vargas <jorgev259@outlook.es>
Date: Fri, 27 Jun 2025 01:10:06 -0600
Subject: [PATCH 1/3] Add Dockerfile

---
 .dockerignore                       |  5 ++++
 .forgejo/workflows/build.yaml       | 16 -------------
 .github/workflows/build-docker.yaml | 37 +++++++++++++++++++++++++++++
 Dockerfile                          | 19 +++++++++++++++
 4 files changed, 61 insertions(+), 16 deletions(-)
 create mode 100644 .dockerignore
 delete mode 100644 .forgejo/workflows/build.yaml
 create mode 100644 .github/workflows/build-docker.yaml
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..d204014
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+node_modules
+dist
+.git
+.env
+.vscode
\ No newline at end of file
diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
deleted file mode 100644
index 1b6ba8f..0000000
--- a/.forgejo/workflows/build.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-on:
-  workflow_dispatch:
-  push:
-
-jobs:
-  build:
-    runs-on: docker
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 'latest'
-          check-latest: true
-          cache: 'yarn'
-      - run: |
-          yarn build
diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
new file mode 100644
index 0000000..d9d7874
--- /dev/null
+++ b/.github/workflows/build-docker.yaml
@@ -0,0 +1,37 @@
+name: Build and Push Docker
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - dev
+      - prod
+
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      #- name: Set up Tailscale
+      #  uses: tailscale/github-action@v2
+      #  with:
+      #    authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/soc-site:$BRANCH_NAME
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..993fa82
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+FROM node:24-alpine AS builder
+WORKDIR /app
+COPY . .
+RUN yarn install --frozen-lockfile
+RUN yarn build
+
+FROM node:24-alpine AS dependencies
+WORKDIR /app
+COPY package.json yarn.lock ./
+RUN yarn install --production --frozen-lockfile
+
+FROM node:24-alpine AS runner
+WORKDIR /app
+ENV HOST=0.0.0.0
+ENV PORT=80
+EXPOSE 80
+COPY --from=builder /app/dist ./dist
+COPY --from=dependencies /app/node_modules ./node_modules
+CMD ["node", "./dist/server/entry.mjs"]
\ No newline at end of file

From 0852567bf477b4acce47e33030ebf23b629374f1 Mon Sep 17 00:00:00 2001
From: Jorge Vargas <jorgev259@outlook.es>
Date: Fri, 27 Jun 2025 01:13:03 -0600
Subject: [PATCH 2/3] .

---
 .github/workflows/build-docker.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
index d9d7874..a0095c8 100644
--- a/.github/workflows/build-docker.yaml
+++ b/.github/workflows/build-docker.yaml
@@ -18,11 +18,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Log in to DockerHub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       #- name: Set up Tailscale
       #  uses: tailscale/github-action@v2

From 0b51ccfd40f9a4c36c8723a54045ab6fd188c172 Mon Sep 17 00:00:00 2001
From: Jorge Vargas <jorgev259@outlook.es>
Date: Fri, 27 Jun 2025 01:14:04 -0600
Subject: [PATCH 3/3] .

---
 .github/workflows/build-docker.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
index a0095c8..57eee1f 100644
--- a/.github/workflows/build-docker.yaml
+++ b/.github/workflows/build-docker.yaml
@@ -35,4 +35,4 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/soc-site:$BRANCH_NAME
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/soc-site:${{ BRANCH_NAME }}