From facb2c9c8ed0ad06c0be8f41ee240ce0f4838297 Mon Sep 17 00:00:00 2001 From: Bret Fisher Date: Sun, 4 Jul 2021 15:19:36 -0400 Subject: [PATCH] more gha tweaks --- .github/workflows/docker-build-and-push.yml | 2 +- .github/workflows/linter.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index 06de496..34150c6 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -89,7 +89,7 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/v7 builder: ${{ steps.buildx.outputs.name }} cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new # don't push during a pull_request, only build push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta.outputs.tags }} diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 10bd92b..d1a24ed 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -51,4 +51,8 @@ jobs: env: VALIDATE_ALL_CODEBASE: false DEFAULT_BRANCH: main + # turn off dockerfilelint, as its a dead project + # https://github.com/replicatedhq/dockerfilelint/issues/169 + # hadolint will run and is sufficent (no need for two linters) + VALIDATE_DOCKERFILE: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}