1 Commits

Author SHA1 Message Date
ca0fc49830 Updated Parcel and added missing packages. 2022-07-11 10:23:22 +01:00
12 changed files with 1002 additions and 1130 deletions

View File

@@ -4,3 +4,7 @@ updates:
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'daily'

View File

@@ -18,14 +18,14 @@ jobs:
env:
DOCKER_CONFIG: $HOME/.docker
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v1
- name: Login to ghcr.io
uses: docker/login-action@v3
uses: docker/login-action@v1
with:
registry: ${{ env.IMAGE_REGISTRY }}
username: ${{ env.IMAGE_OWNER }}
@@ -33,7 +33,7 @@ jobs:
- name: Build Docker Image
id: docker_build_x64
uses: docker/build-push-action@v6
uses: docker/build-push-action@v2
with:
push: true
platforms: linux/amd64
@@ -47,14 +47,14 @@ jobs:
env:
DOCKER_CONFIG: $HOME/.docker
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v1
- name: Login to ghcr.io
uses: docker/login-action@v3
uses: docker/login-action@v1
with:
registry: ${{ env.IMAGE_REGISTRY }}
username: ${{ env.IMAGE_OWNER }}
@@ -62,7 +62,7 @@ jobs:
- name: Build Docker Image
id: docker_build_arm64
uses: docker/build-push-action@v6
uses: docker/build-push-action@v2
with:
push: true
platforms: linux/arm64
@@ -72,9 +72,9 @@ jobs:
Deploy:
runs-on: ubuntu-latest
needs: Build_x86
needs: Build_ARM64
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: Run Ansible playbook
# uses: dawidd6/action-ansible-playbook@v2.5.0
uses: dawidd6/action-ansible-playbook@671974ed60e946e11964cb0c26e69caaa4b1f559

View File

@@ -14,9 +14,13 @@
name: Snyk Container
on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '18 21 * * 3'
permissions:
contents: read
@@ -28,7 +32,7 @@ jobs:
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Build a Docker image
run: docker build -t ghcr.io/fluttershub/homepage:snyk .
- name: Run Snyk to check Docker image for vulnerabilities
@@ -45,6 +49,6 @@ jobs:
image: ghcr.io/fluttershub/homepage:snyk
args: --file=Dockerfile
- name: Upload result to GitHub Code Scanning
uses: github/codeql-action/upload-sarif@v3
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: snyk.sarif

View File

@@ -1,10 +1,7 @@
FROM node:18.20.8 AS base
FROM node:18.4.0 AS base
LABEL version="4.1.0"
LABEL description=""
RUN apt-get update && apt-get upgrade -y \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /usr/src/app
COPY ["package.json", "./"]
COPY ["yarn.lock", "./"]
@@ -14,10 +11,7 @@ RUN yarn install
COPY ["src/", "./src"]
RUN npm run Prod
FROM nginx:1.27.4-alpine as Web
RUN apk --update --no-cache upgrade
FROM nginx:1.23.0-alpine as Web
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

View File

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

View File

@@ -7,7 +7,7 @@
"author": "HotaruBlaze",
"repository": {
"type": "git",
"url": "git@github.com:Fluttershub/Homepage.git"
"url": "git@github.com:github/Fluttershub.git"
},
"scripts": {
"preinit": "npx npm-force-resolutions",
@@ -17,12 +17,15 @@
"Prod": "npm run Cleanup && npm run Init && parcel build src/index.pug --dist-dir build"
},
"devDependencies": {
"@parcel/transformer-pug": "2.13.3",
"@parcel/transformer-sass": "2.13.3",
"parcel": "^2.7.0"
"@parcel/transformer-pug": "2.6.2",
"@parcel/transformer-sass": "2.6.2",
"parcel": "^2.6.2"
},
"engines": {
"node": "^18.*"
},
"resolutions": {
"node-forge": "1.3.1"
"node-forge": "0.10.0"
},
"dependencies": {},
"bugs": {

View File

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

View File

@@ -1,6 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}

View File

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

View File

@@ -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://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')
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')

View File

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

2052
yarn.lock

File diff suppressed because it is too large Load Diff