From 7357c49ef486be7855a9d9cb96a568d48e9a9fec Mon Sep 17 00:00:00 2001
From: Phoenix / Hotaru <DeriousHD@gmail.com>
Date: Fri, 4 Nov 2022 08:20:01 +0000
Subject: [PATCH] Fix Builder

---
 .github/workflows/release.yml | 53 ++++++++++++++++++-----------------
 Dockerfile                    |  7 ++++-
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2ee826d..bc23808 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main  # Set a branch to deploy
+  pull_request:
 
 env:
   IMAGE_REGISTRY: ghcr.io
@@ -11,34 +12,34 @@ env:
   IMAGE_NAME: blog
 
 jobs:
-  Build_x86:
-    runs-on: ubuntu-latest
-    # If running with act, Uncomment below
-    # container: phaze9/action-runner
-    env:
-      DOCKER_CONFIG: $HOME/.docker
-    steps:
-      - uses: actions/checkout@v2
+  # Build_x86:
+  #   runs-on: ubuntu-latest
+  #   # If running with act, Uncomment below
+  #   # container: phaze9/action-runner
+  #   env:
+  #     DOCKER_CONFIG: $HOME/.docker
+  #   steps:
+  #     - uses: actions/checkout@v2
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
+  #     - name: Set up Docker Buildx
+  #       id: buildx
+  #       uses: docker/setup-buildx-action@v1
 
-      - name: Login to ghcr.io
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.IMAGE_REGISTRY }}
-          username: ${{ env.IMAGE_OWNER }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Login to ghcr.io
+  #       uses: docker/login-action@v1
+  #       with:
+  #         registry: ${{ env.IMAGE_REGISTRY }}
+  #         username: ${{ env.IMAGE_OWNER }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push
-        id: docker_build_x64
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          platforms: linux/amd64
-          labels: org.opencontainers.image.source https://github.com/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}
-          tags: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:x64-latest
+  #     - name: Build and push
+  #       id: docker_build_x64
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         push: true
+  #         platforms: linux/amd64
+  #         labels: org.opencontainers.image.source https://github.com/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}
+  #         tags: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:x64-latest
           
   Build_ARM64:
     runs-on: [self-hosted, linux, ARM64]
@@ -47,7 +48,7 @@ jobs:
     env:
       DOCKER_CONFIG: $HOME/.docker
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
         id: buildx
diff --git a/Dockerfile b/Dockerfile
index f79d742..724f57d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,8 @@
+FROM jakejarvis/hugo-extended:0.105.0 as Builder
+COPY src/ /app
+WORKDIR /app
+RUN /usr/bin/hugo --minify
+
 FROM nginx:1.19.6-alpine as web
 LABEL maintainer="Phoenix (https://github.com/HotaruBlaze)"
 COPY docker/nginx.conf /etc/nginx/nginx.conf
@@ -12,5 +17,5 @@ LABEL traefik.enable=true
 
 EXPOSE 80
 RUN rm -Rf /usr/share/nginx/html/ && rm /etc/nginx/conf.d/default.conf
-COPY ./src/build /usr/share/nginx/html/
+COPY --from=Builder /app/public /usr/share/nginx/html/
 CMD [ "nginx", "-g", "daemon off;" ]
\ No newline at end of file