From 1575f10ce63f484b42c3d0b733eab19269098f1a Mon Sep 17 00:00:00 2001
From: Brad McCoy <bradmccoydev@gmail.com>
Date: Tue, 8 Nov 2022 12:45:29 +1000
Subject: [PATCH] chore: modfiy github actions

Signed-off-by: Brad McCoy <bradmccoydev@gmail.com>
---
 .github/workflows/helm-chart-releaser.yml |  2 ++
 .github/workflows/package.yaml            | 23 ++++++++++++++++++++---
 chart/backstage/values.yaml               |  4 ----
 packages/app/Dockerfile                   |  3 +++
 packages/backend/Dockerfile               |  3 +++
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/helm-chart-releaser.yml b/.github/workflows/helm-chart-releaser.yml
index a0c293f..a9528cc 100644
--- a/.github/workflows/helm-chart-releaser.yml
+++ b/.github/workflows/helm-chart-releaser.yml
@@ -34,6 +34,8 @@ jobs:
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.4.1
+        with:
+          charts_dir: chart
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 711dd7c..01fcd2c 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -9,6 +9,11 @@ on:
 
 jobs:
   package:
+    permissions:
+      contents: write # needed to write releases
+      packages: write # needed for ghcr access
+      id-token: write # needed for keyless signing
+
     name: Package
     runs-on: ubuntu-latest
     steps:
@@ -28,12 +33,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
+      - name: docker login
+        env:
+          DOCKER_USER: ${{secrets.DOCKER_USER}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+        run: |
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download artifact
@@ -46,7 +58,9 @@ jobs:
         id: metadata
         uses: docker/metadata-action@v3
         with:
-          images: ${{ steps.variables.outputs.image }}
+          images: |
+            bradmccoydev/backstage:${{ inputs.type }}
+            ${{ steps.variables.outputs.image }}:0.0.1
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -63,7 +77,10 @@ jobs:
         with:
           context: .
           file: ${{ steps.variables.outputs.dockerfile }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/chart/backstage/values.yaml b/chart/backstage/values.yaml
index 780f2f9..f13ed28 100644
--- a/chart/backstage/values.yaml
+++ b/chart/backstage/values.yaml
@@ -1,7 +1,3 @@
-# Default values for backstage.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
 # -- Override the name of the chart.
 nameOverride: ""
 # -- Override the fullname of the chart.
diff --git a/packages/app/Dockerfile b/packages/app/Dockerfile
index fec5bd0..70f70c2 100644
--- a/packages/app/Dockerfile
+++ b/packages/app/Dockerfile
@@ -1,5 +1,8 @@
 FROM nginx:mainline
 
+LABEL org.opencontainers.image.source=https://github.com/ortelius/backstage
+LABEL org.opencontainers.image.description="Ortelius Backstage Frontend"
+
 RUN apt-get update && apt-get -y install jq && rm -rf /var/lib/apt/lists/*
 
 # RUN set -eu; \
diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile
index f0be3ac..8d2c826 100644
--- a/packages/backend/Dockerfile
+++ b/packages/backend/Dockerfile
@@ -11,6 +11,9 @@
 
 FROM node:16-bullseye-slim
 
+LABEL org.opencontainers.image.source=https://github.com/ortelius/backstage
+LABEL org.opencontainers.image.description="Ortelius Backstage Backend"
+
 # Install sqlite3 dependencies. You can skip this if you don't use sqlite3 in the image,
 # in which case you should also move better-sqlite3 to "devDependencies" in package.json.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \