From 088d03939ce54e182cb07a1bd366cf35ecba16d0 Mon Sep 17 00:00:00 2001 From: Aaron Yarborough Date: Sun, 13 Oct 2024 13:37:49 +0100 Subject: [PATCH] build: build multi-platform image --- .github/workflows/docker-image.yml | 21 ++++++++++++--------- package-lock.json | 4 ++-- public/sitemap-0.xml | 10 +++++----- src/pages/cv/index.js | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 3d7cc3a..374d20c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,42 +15,45 @@ env: jobs: build-and-push-image: runs-on: ubuntu-latest - # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. permissions: contents: read packages: write attestations: write id-token: write - # + steps: - name: Checkout repository uses: actions/checkout@v4 - # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here. + - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels. + - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages. - # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository. - # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step. + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build and push Docker image id: push - uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + uses: docker/build-push-action@v6 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)." - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 with: diff --git a/package-lock.json b/package-lock.json index 15351ae..f31e6c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "www-aaronjy-2024", - "version": "0.1.0", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "www-aaronjy-2024", - "version": "0.1.0", + "version": "1.0.0", "dependencies": { "next": "^14.2.6", "next-seo": "^6.5.0", diff --git a/public/sitemap-0.xml b/public/sitemap-0.xml index 75e20c5..9c2e653 100644 --- a/public/sitemap-0.xml +++ b/public/sitemap-0.xml @@ -1,8 +1,8 @@ -https://www.aaronjy.me/2024-10-06T19:40:04.941Zdaily0.7 -https://www.aaronjy.me/cv/2024-10-06T19:40:04.941Zdaily0.7 -https://www.aaronjy.me/writing/2024-10-06T19:40:04.941Zdaily0.7 -https://www.aaronjy.me/writing/static-site-on-google-cloud/2024-10-06T19:40:04.941Zdaily0.7 -https://www.aaronjy.me/writing/support-content-filte-structure-changes-on-a-static-site/2024-10-06T19:40:04.941Zdaily0.7 +https://www.aaronjy.me/2024-10-13T12:32:05.486Zdaily0.7 +https://www.aaronjy.me/cv/2024-10-13T12:32:05.488Zdaily0.7 +https://www.aaronjy.me/writing/2024-10-13T12:32:05.488Zdaily0.7 +https://www.aaronjy.me/writing/static-site-on-google-cloud/2024-10-13T12:32:05.488Zdaily0.7 +https://www.aaronjy.me/writing/support-content-filte-structure-changes-on-a-static-site/2024-10-13T12:32:05.488Zdaily0.7 \ No newline at end of file diff --git a/src/pages/cv/index.js b/src/pages/cv/index.js index fc0e548..220a0a1 100644 --- a/src/pages/cv/index.js +++ b/src/pages/cv/index.js @@ -4,7 +4,7 @@ import yaml from 'js-yaml' import fs from 'fs' import showdown from 'showdown' import { NextSeo } from 'next-seo' -import Cv from '@/components/CV/CV' +import Cv from '@/components/Cv/Cv' function CVPage ({ competencies,