From 87298985a7f94724ab467ab9814bd6c41fcb3027 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 25 Mar 2022 09:05:06 +0000
Subject: [PATCH] Update Docker workflow some more

---
 .github/workflows/docker.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2c5d9e5e6..5c59a02a6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,10 +5,10 @@ name: "Docker"
 on:
   release: # A GitHub release was published
     types: [published]
-  workflow_run: # The Dendrite pipeline completed successfully on main
-    workflows: [Dendrite]
-    types: [completed]
-    branches: [main]
+  #workflow_run: # The Dendrite pipeline completed successfully on main
+  #  workflows: [Dendrite]
+  #  types: [completed]
+  #  branches: [main]
   workflow_dispatch: # A build was manually requested
 
 env:
@@ -21,6 +21,9 @@ jobs:
   monolith:
     name: Monolith image
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -40,7 +43,7 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build monolith image
@@ -80,6 +83,9 @@ jobs:
   polylith:
     name: Polylith image
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -99,7 +105,7 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build polylith image