Add packages for building node_modules with ARM64

Bump node from 18.4.0 to 18.5.0

.github/workflows/actions.yml

@@ -1,88 +1,96 @@
-name: Docker Build
-
-on:
-  push:
-    branches:
-      - main
-env:
-  IMAGE_REGISTRY: ghcr.io
-  TOKEN_USER: HotaruBlaze
-  IMAGE_OWNER: fluttershub
-  IMAGE_NAME: homepage
-
-jobs:
-  BuildImage:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        CPU_ARCH:
-          - arm64
-          - x86_64
-    # If running with act, Uncomment below
-    # container: phaze9/action-runner
-    env:
-      DOCKER_CONFIG: $HOME/.docker
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      
-      - name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
-
-      - name: Login to ghcr.io
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.IMAGE_REGISTRY }}
-          username: ${{ env.TOKEN_USER }}
-          password: ${{ secrets.TOKEN }}
-
-      - name: Build and push - x64
-        id: docker_build_x64
-        uses: docker/build-push-action@v2
-        if: ${{ matrix.CPU_ARCH == 'x86_64'}} 
-        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 - arm64
-        id: docker_build_arm64
-        uses: docker/build-push-action@v2
-        if: ${{ matrix.CPU_ARCH == 'arm64'}} 
-        with:
-          push: true
-          platforms: linux/arm64
-          labels: org.opencontainers.image.source https://github.com/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}
-          tags: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:arm-latest
-
-  Deploy:
-    runs-on: ubuntu-latest
-    needs: BuildImage
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run Ansible playbook
-        # uses: dawidd6/action-ansible-playbook@v2.5.0
-        uses: dawidd6/action-ansible-playbook@671974ed60e946e11964cb0c26e69caaa4b1f559
-        with:
-          playbook: playbook.yml
-          directory: ./
-          key: ${{secrets.DEPLOY_SSH_KEY}}
-          inventory: |
-            [docker]
-            fluttershub.com
-            [docker:vars]
-            ansible_ssh_common_args='-o StrictHostKeyChecking=no'
-            ansible_ssh_user=deploy
-          options: |
-            --verbose
-          # Set to "true" if root is required for running your playbook
-          # sudo: false # optional
-          # Set to "true" if the Ansible output should not include colors (defaults to "false")
-          # no_color: # optional
+name: Docker Build
+
+on:
+  push:
+    branches:
+      - main  # Set a branch to deploy
+
+env:
+  IMAGE_REGISTRY: ghcr.io
+  IMAGE_OWNER: fluttershub
+  IMAGE_NAME: homepage
+
+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
+
+      - 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: Build Docker Image
+        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]
+    # 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: Login to ghcr.io
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ env.IMAGE_REGISTRY }}
+          username: ${{ env.IMAGE_OWNER }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Docker Image
+        id: docker_build_arm64
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: linux/arm64
+          labels: org.opencontainers.image.source https://github.com/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}
+          tags: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:arm64-latest
+
+
+  Deploy:
+    runs-on: ubuntu-latest
+    needs: Build_x86
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run Ansible playbook
+        # uses: dawidd6/action-ansible-playbook@v2.5.0
+        uses: dawidd6/action-ansible-playbook@671974ed60e946e11964cb0c26e69caaa4b1f559
+        with:
+          playbook: playbook.yml
+          directory: ./
+          key: ${{secrets.DEPLOY_SSH_KEY}}
+          inventory: |
+            [docker]
+            fluttershub.com
+            [docker:vars]
+            ansible_ssh_common_args='-o StrictHostKeyChecking=no'
+            ansible_ssh_user=deploy
+          options: |
+            --verbose
+          # Set to "true" if root is required for running your playbook
+          # sudo: false # optional
+          # Set to "true" if the Ansible output should not include colors (defaults to "false")
+          # no_color: # optional

.github/workflows/snyk-container.yml

@@ -39,7 +39,7 @@ jobs:
       # Snyk can be used to break the build when it detects vulnerabilities.
       # In this case we want to upload the issues to GitHub Code Scanning
       continue-on-error: true
-      uses: snyk/actions/docker@14818c4695ecc4045f33c9cee9e795a788711ca4
+      uses: snyk/actions/docker@master
       env:
         # In order to use the Snyk Action you will need to have a Snyk API token.
         # More details in https://github.com/snyk/actions#getting-your-snyk-token

Dockerfile

@@ -1,20 +1,22 @@
-FROM node:18-alpine AS base
+FROM node:18.6-alpine AS base
 LABEL version="4.1.0"
 LABEL description=""
 
+RUN apk --update --no-cache upgrade && apk add g++ make python --no-cache
+
 WORKDIR /usr/src/app
 COPY ["package.json", "./"]
 COPY ["yarn.lock", "./"]
 
 FROM base AS builder
-RUN apk add --no-cache --virtual .gyp python3 make g++ \
-    && yarn install \    
-    && apk del .gyp
-
+RUN yarn install
 COPY ["src/", "./src"]
 RUN npm run Prod
 
-FROM nginx:1.21.6-alpine as Web
+FROM nginx:1.23.0-alpine as Web
+
+RUN apk --update --no-cache upgrade
+
 LABEL maintainer="Phoenix (https://github.com/HotaruBlaze)"
 COPY docker/nginx.conf /etc/nginx/nginx.conf
 COPY docker/web.conf /etc/nginx/conf.d/web.conf

package.json

@@ -17,7 +17,9 @@
     "Prod": "npm run Cleanup && npm run Init && parcel build src/index.pug --dist-dir build"
   },
   "devDependencies": {
-    "parcel": "^2.5.0"
+    "@parcel/transformer-pug": "2.6.2",
+    "@parcel/transformer-sass": "2.6.2",
+    "parcel": "^2.6.2"
   },
   "engines": {
     "node": "^18.*"

playbook.yml

@@ -18,7 +18,6 @@
         mode: '0755'
       loop:
         - docker-compose.yml
-      register: compose
 
     - name: deploy Docker Compose stack if updated
       community.docker.docker_compose:
@@ -26,4 +25,3 @@
         pull: true
         files:
           - docker-compose.yml
-      when: compose.changed

src/index.pug

@@ -14,7 +14,7 @@ html(lang='en')
     .container
       .pod
         .glow
-          img#profile_pic(src='https://img.fluttershub.com/VjpiMs7xp60yEcAH.png', alt='')
+          img#profile_pic(src='https://s3.fluttershub.com/fluttershub-com/public/profile_pic.png', alt='')
         h1.welcome_text.text-flicker.text-flicker-1 Phoenix/Hotaru
         p.about_me.standard_text.text-box-glow
         .pod
@@ -24,4 +24,5 @@ html(lang='en')
           a.standard_text.text-flicker-2(href="https://gitlab.com/HotaruBlaze") Gitlab
         footer.standard_text.footer-slide
           .creator
-            a.build_text(href="https://img.fluttershub.com/EgOwhwrHyHWw.png") Cookie? 🍪
+            a.build_text(href="https://www.youtube.com/watch?v=5DWFZhAVI3s") Cookie?
+              a.cookie(href="https://img.fluttershub.com/pdDK7pdVJZU3d9UI.jpg") 🍪

src/ogp.pug

@@ -2,5 +2,5 @@ meta(property='og:url', content='https://fluttershub.com')
 meta(property='og:type', content='website')
 meta(property='og:title', content='Phoenix\'s Personal Website')
 meta(property='og:description', content='We got cookies and milk!')
-meta(property='og:image', content='http://storage.googleapis.com/api.fluttershub.com/images/public/profile_pic.jpg')
-meta(property='og:image:secure_url', content='https://storage.googleapis.com/api.fluttershub.com/images/public/profile_pic.jpg')
+meta(property='og:image', content='http://s3.fluttershub.com/fluttershub-com/public/profile_pic.png')
+meta(property='og:image:secure_url', content='https://s3.fluttershub.com/fluttershub-com/public/profile_pic.png')

src/scss/components/common.scss

@@ -60,6 +60,9 @@ body,html, .container {
     -moz-user-select: text;
     text-decoration: none;
 }
+.cookie {
+   text-decoration: none !important;
+}
 
 .no_hightnight a:link, a{
     color: inherit;