From 78831bd9270f67d459b648cffcedfd13831b6e2a Mon Sep 17 00:00:00 2001
From: Anthony Rabbito <arabbito@coreweave.com>
Date: Thu, 27 Jun 2024 17:13:38 -0400
Subject: [PATCH] fix(ci): add workflow_dispatch to helm and missing
 token/context (#4)

Dockerfile assumes root so set context to root. CR_TOKEN isn't default so set it

Also tweak dockerbuild process
---
 .github/workflows/charts-release-oci.yaml | 2 ++
 .github/workflows/publish-image.yaml      | 4 +++-
 Docker/Dockerfile                         | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/charts-release-oci.yaml b/.github/workflows/charts-release-oci.yaml
index cdcb927..662735a 100644
--- a/.github/workflows/charts-release-oci.yaml
+++ b/.github/workflows/charts-release-oci.yaml
@@ -1,6 +1,7 @@
 name: "Charts: Release to GHCR OCI"
 
 on:
+  workflow_dispatch: {}
   push:
     branches: [main]
     paths:
@@ -36,6 +37,7 @@ jobs:
         uses: helm/chart-releaser-action@v1.6.0
         env:
           skip_upload: true
+          CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push Charts to GHCR
         run: |
diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml
index 402ee70..1020310 100644
--- a/.github/workflows/publish-image.yaml
+++ b/.github/workflows/publish-image.yaml
@@ -15,6 +15,7 @@ jobs:
     name: Publish Image
     permissions:
       contents: write
+      packages: write
     runs-on: ubuntu-latest
 
     steps:
@@ -36,7 +37,8 @@ jobs:
         uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
         with:
           push: true
-          context: ./Docker
+          context: ./
+          file: ./Docker/Dockerfile
           build-args: |
             VERSION=${{ env.UPSTREAM_TS_VERSION }}
           tags: |
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 81d4438..c4ab813 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -23,3 +23,5 @@ RUN apt-get update && \
     chmod +x /app/healthprobe.sh
 
 ENTRYPOINT ["/app/entrypoint.sh"]
+
+LABEL org.opencontainers.image.source="https://github.com/tailscale/tailscale"