Fix Builder

This commit is contained in:
2022-11-04 08:20:01 +00:00
parent d3709c9a9a
commit 7357c49ef4
2 changed files with 33 additions and 27 deletions

View File

@@ -4,6 +4,7 @@ on:
push: push:
branches: branches:
- main # Set a branch to deploy - main # Set a branch to deploy
pull_request:
env: env:
IMAGE_REGISTRY: ghcr.io IMAGE_REGISTRY: ghcr.io
@@ -11,34 +12,34 @@ env:
IMAGE_NAME: blog IMAGE_NAME: blog
jobs: jobs:
Build_x86: # Build_x86:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
# If running with act, Uncomment below # # If running with act, Uncomment below
# container: phaze9/action-runner # # container: phaze9/action-runner
env: # env:
DOCKER_CONFIG: $HOME/.docker # DOCKER_CONFIG: $HOME/.docker
steps: # steps:
- uses: actions/checkout@v2 # - uses: actions/checkout@v2
- name: Set up Docker Buildx # - name: Set up Docker Buildx
id: buildx # id: buildx
uses: docker/setup-buildx-action@v1 # uses: docker/setup-buildx-action@v1
- name: Login to ghcr.io # - name: Login to ghcr.io
uses: docker/login-action@v1 # uses: docker/login-action@v1
with: # with:
registry: ${{ env.IMAGE_REGISTRY }} # registry: ${{ env.IMAGE_REGISTRY }}
username: ${{ env.IMAGE_OWNER }} # username: ${{ env.IMAGE_OWNER }}
password: ${{ secrets.GITHUB_TOKEN }} # password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push # - name: Build and push
id: docker_build_x64 # id: docker_build_x64
uses: docker/build-push-action@v2 # uses: docker/build-push-action@v2
with: # with:
push: true # push: true
platforms: linux/amd64 # platforms: linux/amd64
labels: org.opencontainers.image.source https://github.com/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }} # 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 # tags: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:x64-latest
Build_ARM64: Build_ARM64:
runs-on: [self-hosted, linux, ARM64] runs-on: [self-hosted, linux, ARM64]
@@ -47,7 +48,7 @@ jobs:
env: env:
DOCKER_CONFIG: $HOME/.docker DOCKER_CONFIG: $HOME/.docker
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx
id: buildx id: buildx

View File

@@ -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 FROM nginx:1.19.6-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
@@ -12,5 +17,5 @@ LABEL traefik.enable=true
EXPOSE 80 EXPOSE 80
RUN rm -Rf /usr/share/nginx/html/ && rm /etc/nginx/conf.d/default.conf 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;" ] CMD [ "nginx", "-g", "daemon off;" ]