11 Commits

Author SHA1 Message Date
ca0fc49830 Updated Parcel and added missing packages. 2022-07-11 10:23:22 +01:00
5873412a9f Use latest snyk image. 2022-07-11 09:49:40 +01:00
dependabot[bot]
6a9aef07db Bump nginx from 1.21.6-alpine to 1.23.0-alpine
Bumps nginx from 1.21.6-alpine to 1.23.0-alpine.

---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-11 09:36:21 +01:00
dependabot[bot]
21ebb45089 Bump parcel from 2.6.0 to 2.6.1
Bumps [parcel](https://github.com/parcel-bundler/parcel) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/parcel-bundler/parcel/releases)
- [Changelog](https://github.com/parcel-bundler/parcel/blob/v2/CHANGELOG.md)
- [Commits](https://github.com/parcel-bundler/parcel/compare/v2.6.0...v2.6.1)

---
updated-dependencies:
- dependency-name: parcel
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-20 10:47:40 +01:00
d9c7cb6963 Use github Token Again 2022-06-17 08:03:31 +01:00
870672d19b Delete actions.yml.old.yml 2022-06-17 07:59:37 +01:00
dependabot[bot]
ca7ae870e8 Bump parcel from 2.5.0 to 2.6.0
Bumps [parcel](https://github.com/parcel-bundler/parcel) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/parcel-bundler/parcel/releases)
- [Changelog](https://github.com/parcel-bundler/parcel/blob/v2/CHANGELOG.md)
- [Commits](https://github.com/parcel-bundler/parcel/compare/v2.5.0...v2.6.0)

---
updated-dependencies:
- dependency-name: parcel
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-17 07:53:11 +01:00
dependabot[bot]
69b0417d03 Bump node from 18.0.0 to 18.4.0
Bumps node from 18.0.0 to 18.4.0.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-17 07:43:40 +01:00
99c80d7737 Change ghcr.io login 2022-05-19 17:49:53 +01:00
bc53f36260 Replace actions with a known working ARM Copy from blog. 2022-05-19 17:44:04 +01:00
caa9280236 Revert "Change base to use alpine (#15)"
This reverts commit 44f63b49cb.
2022-05-19 17:26:56 +01:00
6 changed files with 1025 additions and 523 deletions

View File

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

View File

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

View File

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

View File

@@ -2,7 +2,7 @@ version: "3"
services: services:
fluttershub.com: fluttershub.com:
image: ghcr.io/fluttershub/homepage:x64-latest image: ghcr.io/fluttershub/homepage:arm64-latest
restart: always restart: always
networks: networks:
- external - external

View File

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

1347
yarn.lock

File diff suppressed because it is too large Load Diff