Skip to content

Commit

Permalink
fix(ci): add workflow_dispatch to helm and missing token/context (#4)
Browse files Browse the repository at this point in the history
Dockerfile assumes root so set context to root. CR_TOKEN isn't default so set it

Also tweak dockerbuild process
  • Loading branch information
anthr76 authored Jun 27, 2024
1 parent 7311358 commit 78831bd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/charts-release-oci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "Charts: Release to GHCR OCI"

on:
workflow_dispatch: {}
push:
branches: [main]
paths:
Expand Down Expand Up @@ -36,6 +37,7 @@ jobs:
uses: helm/[email protected]
env:
skip_upload: true
CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Push Charts to GHCR
run: |
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/publish-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
name: Publish Image
permissions:
contents: write
packages: write
runs-on: ubuntu-latest

steps:
Expand All @@ -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: |
Expand Down
2 changes: 2 additions & 0 deletions Docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 78831bd

Please sign in to comment.