From 1df69f651f652a98e1d4608aec6d06f997917c5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:08:08 -0600 Subject: [PATCH] Bump yoheimuta/protolint from v0.28.0 to v0.28.1 (#1169) * Bump yoheimuta/protolint from v0.28.0 to v0.28.1 Bumps yoheimuta/protolint from v0.28.0 to v0.28.1. Signed-off-by: dependabot[bot] * maybe * maybe * use better docker * use better docker * use better docker * use better docker * use better docker * use better docker * fixed it Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Admiral Awkbar --- .automation/test/arm/reports/expected-ARM.tap | 2 +- .github/workflows/deploy-DEV.yml | 27 +++++++++++-------- Dockerfile | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.automation/test/arm/reports/expected-ARM.tap b/.automation/test/arm/reports/expected-ARM.tap index 08be3a94..6fc3f920 100644 --- a/.automation/test/arm/reports/expected-ARM.tap +++ b/.automation/test/arm/reports/expected-ARM.tap @@ -2,6 +2,6 @@ TAP version 13 1..2 not ok 1 - arm_bad_1.json --- - message: \nValidating arm\arm_bad_1.json\n deploymentTemplate\n [+] adminUsername Should Not Be A Literal\n [+] apiVersions Should Be Recent\n [+] artifacts parameter\n [+] DependsOn Best Practices\n [+] Deployment Resources Must Not Be Debug\n [+] DeploymentTemplate Must Not Contain Hardcoded Uri\n [+] DeploymentTemplate Schema Is Correct\n [+] Dynamic Variable References Should Not Use Concat\n [+] IDs Should Be Derived From ResourceIDs\n [+] Location Should Not Be Hardcoded\n [+] ManagedIdentityExtension must not be used\n [+] Min And Max Value Are Numbers\n [+] Outputs Must Not Contain Secrets\n [+] Parameters Must Be Referenced\n [+] Parameters Property Must Exist\n [+] providers apiVersions Is Not Permitted\n [+] ResourceIds should not contain\n [+] Resources Should Have Location\n [+] Secure String Parameters Cannot Have Default\n [-] Template Should Not Contain Blanks\n Empty property [] found on line 28 Index 1331\n Empty property "" found on line 3 Index 121\n\n [-] Variables Must Be Referenced\n Unreferenced variable Network.Location\n Unreferenced variable Test.Blank.Variable\n\n [+] Virtual Machines Should Not Be Preview\n [+] VM Images Should Use Latest Version\n [+] VM Size Should Be A Parameter\n \n + message: \nValidating arm\arm_bad_1.json\n deploymentTemplate\n [+] adminUsername Should Not Be A Literal\n [+] apiVersions Should Be Recent\n [+] artifacts parameter\n [+] CommandToExecute Must Use ProtectedSettings For Secrets\n [+] DependsOn Best Practices\n [+] Deployment Resources Must Not Be Debug\n [+] DeploymentTemplate Must Not Contain Hardcoded Uri\n [+] DeploymentTemplate Schema Is Correct\n [+] Dynamic Variable References Should Not Use Concat\n [+] IDs Should Be Derived From ResourceIDs\n [+] Location Should Not Be Hardcoded\n [+] ManagedIdentityExtension must not be used\n [+] Min And Max Value Are Numbers\n [+] Outputs Must Not Contain Secrets\n [+] Parameters Must Be Referenced\n [+] Parameters Property Must Exist\n [+] providers apiVersions Is Not Permitted\n [+] ResourceIds should not contain\n [+] Resources Should Have Location\n [+] Secure String Parameters Cannot Have Default\n [-] Template Should Not Contain Blanks\n Empty property [] found on line 28 Index 1331\n Empty property "" found on line 3 Index 121\n\n [-] Variables Must Be Referenced\n Unreferenced variable Network.Location\n Unreferenced variable Test.Blank.Variable\n\n [+] Virtual Machines Should Not Be Preview\n [+] VM Images Should Use Latest Version\n [+] VM Size Should Be A Parameter\n \n ... ok 2 - arm_good_1.json diff --git a/.github/workflows/deploy-DEV.yml b/.github/workflows/deploy-DEV.yml index 32fa60a3..43835a7a 100644 --- a/.github/workflows/deploy-DEV.yml +++ b/.github/workflows/deploy-DEV.yml @@ -52,17 +52,22 @@ jobs: ################################### # Build image locally for testing # ################################### - - name: Build image - uses: whoan/docker-build-with-cache-action@v5 - with: - username: ${{ secrets.GCR_USERNAME }} - password: ${{ secrets.GCR_TOKEN }} - registry: ghcr.io - image_name: github/super-linter - image_tag: ${{ github.sha }} - dockerfile: Dockerfile - build_extra_args: "--build-arg=BUILD_DATE=${{ env.BUILD_DATE }} --build-arg=BUILD_REVISION=${{ github.sha }} --build-arg=BUILD_VERSION=${{ github.sha }}" - push_image_and_stages: false + ########################################### + # Build and Push containers to registries # + ########################################### + - name: Build Docker image + run: | + docker build \ + --build-arg BUILD_DATE=${{ env.BUILD_DATE }} \ + --build-arg BUILD_REVISION=${{ github.sha }} \ + --build-arg BUILD_VERSION=${{ github.sha }} \ + -t ghcr.io/github/super-linter:${{ github.sha }} -f Dockerfile . + + ############## + # Print info # + ############## + - name: Get Docker info + run: docker images ######################################## # Validates the metadata docker labels # diff --git a/Dockerfile b/Dockerfile index e3bcc2ed..36d7b610 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ FROM cljkondo/clj-kondo:2021.01.20-alpine as clj-kondo FROM dotenvlinter/dotenv-linter:3.0.0 as dotenv-linter FROM mstruebing/editorconfig-checker:2.3.1 as editorconfig-checker -FROM yoheimuta/protolint:v0.28.0 as protolint +FROM yoheimuta/protolint:v0.28.1 as protolint FROM golangci/golangci-lint:v1.36.0 as golangci-lint FROM koalaman/shellcheck:v0.7.1 as shellcheck FROM wata727/tflint:0.23.1 as tflint