diff --git a/.github/workflows/1password.yml b/.github/workflows/1password.yml index add183a3..cf98e843 100644 --- a/.github/workflows/1password.yml +++ b/.github/workflows/1password.yml @@ -1,21 +1,17 @@ name: Example Workflow - on: [push] - jobs: retrieve-secret: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Load secret - uses: 1password/load-secrets-action@v1 - with: - export-env: true - env: - OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} - SECRET: op://infra/Test1password/credential - - - name: Use Secret - run: echo "Secret value is $SECRET" + - name: Checkout + uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2 + - name: Load secret + uses: 1password/load-secrets-action@6d1c2654be9ad019ca5c3839a61e91f6f1c10635 # v1 + with: + export-env: true + env: + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} + SECRET: op://infra/Test1password/credential + - name: Use Secret + run: echo "Secret value is $SECRET" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b329bb83..20f89bba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,30 +1,25 @@ name: Docker - # This workflow uses actions that are not certified by GitHub. # They are provided by a third-party and are governed by # separate terms of service, privacy policy, and support # documentation. - on: workflow_dispatch: schedule: - cron: '15 12 * * *' push: - branches: [ "main" ] + branches: ["main"] # Publish semver tags as releases. - tags: [ 'v*.*.*' ] + tags: ['v*.*.*'] pull_request: - branches: [ "main" ] - + branches: ["main"] env: # Use docker.io for Docker Hub if empty REGISTRY: ghcr.io # github.repository as / IMAGE_NAME: ${{ github.repository }} - jobs: build: - runs-on: ubuntu-latest permissions: contents: read @@ -32,11 +27,9 @@ jobs: # This is used to complete the identity challenge # with sigstore/fulcio when running outside of PRs. id-token: write - steps: - name: Checkout repository - uses: actions/checkout@v3 - + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 # Install the cosign tool except on PR # https://github.com/sigstore/cosign-installer - name: Install cosign @@ -44,11 +37,9 @@ jobs: uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1 with: cosign-release: 'v2.1.1' - # Workaround: https://github.com/docker/build-push-action/issues/461 - name: Setup Docker buildx uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - # Login against a Docker registry except on PR # https://github.com/docker/login-action - name: Log into registry ${{ env.REGISTRY }} @@ -58,7 +49,6 @@ jobs: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # Extract metadata (tags, labels) for Docker # https://github.com/docker/metadata-action - name: Extract Docker metadata @@ -66,7 +56,6 @@ jobs: uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - # Build and push Docker image with Buildx (don't push on PR) # https://github.com/docker/build-push-action - name: Build and push Docker image @@ -79,8 +68,6 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max - - # Sign the resulting Docker image digest except on PRs. # This will only write to the public Rekor transparency log when the Docker # repository is public to avoid leaking data. If you would like to publish