From d58aa41f2c93612b55405db23168122f9397111e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Mar 2021 04:00:58 +0000 Subject: [PATCH 1/8] chore(deps): bump nginx from 1.19.7 to 1.19.9 Bumps nginx from 1.19.7 to 1.19.9. Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 456cda4..19c0147 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 go build -ldflags '-w -s -extldflags "-static"' -o /healthchec # # image used to copy our official nginx binaries -FROM nginx:1.19.7 AS base +FROM nginx:1.19.9 AS base # create empty index page RUN echo 'Hello world' > /index.html From aff658b459fb9ce181a9ff22a7e1e31ba541ad9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Apr 2021 04:02:28 +0000 Subject: [PATCH 2/8] chore(deps): bump golang from 1.16.1-alpine to 1.16.3-alpine Bumps golang from 1.16.1-alpine to 1.16.3-alpine. Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 456cda4..f15c939 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # image used for the healthcheck binary -FROM golang:1.16.1-alpine AS gobuilder +FROM golang:1.16.3-alpine AS gobuilder COPY healthcheck/ /go/src/healthcheck/ RUN CGO_ENABLED=0 go build -ldflags '-w -s -extldflags "-static"' -o /healthcheck /go/src/healthcheck/ From 1f223096b466543366123e83e5fab55a107e159b Mon Sep 17 00:00:00 2001 From: Niels Hofmans Date: Sat, 3 Apr 2021 13:28:06 +0200 Subject: [PATCH 3/8] Update pr.yaml --- .github/workflows/pr.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e932822..f81848e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -56,12 +56,3 @@ jobs: aquasec/trivy --severity HIGH,CRITICAL,MEDIUM --no-progress --only-update $DISTRO --ignore-unfixed --exit-code 1 --cache-dir /root/.cache/ image docker run --rm -v "$(pwd)/vulndb/":/root/.cache/ alpine:latest chmod 777 -R /root/.cache/ - - approve: - name: Dependabot PR Auto-approve - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' - runs-on: ubuntu-latest - steps: - - uses: hmarr/auto-approve-action@v2.0.0 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" From 8e2a74e84e22794c31c5e0851831f55c58653706 Mon Sep 17 00:00:00 2001 From: Niels Hofmans Date: Sat, 3 Apr 2021 13:28:40 +0200 Subject: [PATCH 4/8] Create approve.yaml --- .github/workflows/approve.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/approve.yaml diff --git a/.github/workflows/approve.yaml b/.github/workflows/approve.yaml new file mode 100644 index 0000000..0310706 --- /dev/null +++ b/.github/workflows/approve.yaml @@ -0,0 +1,14 @@ +name: Auto approve + +on: + pull_request_target + +jobs: + approve: + name: Dependabot PR Auto-approve + if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + runs-on: ubuntu-latest + steps: + - uses: hmarr/auto-approve-action@v2.0.0 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" From 5e9fef869da0119bee6a10b3feef3ce71a6f2c07 Mon Sep 17 00:00:00 2001 From: Niels Hofmans Date: Sat, 3 Apr 2021 13:32:26 +0200 Subject: [PATCH 5/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f15c939..3e982e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # image used for the healthcheck binary FROM golang:1.16.3-alpine AS gobuilder COPY healthcheck/ /go/src/healthcheck/ -RUN CGO_ENABLED=0 go build -ldflags '-w -s -extldflags "-static"' -o /healthcheck /go/src/healthcheck/ +RUN CGO_ENABLED=0 GO111MODULE=auto go build -trimpath -ldflags '-w -s -extldflags "-static"' -o /healthcheck /go/src/healthcheck/ # # --- From fccf43a47b167fddb0ea5d2275b6331d6b9ab229 Mon Sep 17 00:00:00 2001 From: Niels Hofmans Date: Sat, 3 Apr 2021 13:37:57 +0200 Subject: [PATCH 6/8] Update approve.yaml --- .github/workflows/approve.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/approve.yaml b/.github/workflows/approve.yaml index 0310706..7c7ab6d 100644 --- a/.github/workflows/approve.yaml +++ b/.github/workflows/approve.yaml @@ -1,14 +1,16 @@ -name: Auto approve +name: Automerge on: pull_request_target jobs: - approve: - name: Dependabot PR Auto-approve - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + auto-merge: runs-on: ubuntu-latest steps: - - uses: hmarr/auto-approve-action@v2.0.0 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" + - + uses: actions/checkout@v2 + - + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + target: minor + github-token: ${{ secrets.GITHUB_TOKEN }} From f6aff79c76ebe4521d12f0112dd571d80811834b Mon Sep 17 00:00:00 2001 From: Niels Hofmans Date: Sat, 3 Apr 2021 13:40:06 +0200 Subject: [PATCH 7/8] Update and rename approve.yaml to automerge.yaml --- .github/workflows/approve.yaml | 16 ---------------- .github/workflows/automerge.yaml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 .github/workflows/approve.yaml create mode 100644 .github/workflows/automerge.yaml diff --git a/.github/workflows/approve.yaml b/.github/workflows/approve.yaml deleted file mode 100644 index 7c7ab6d..0000000 --- a/.github/workflows/approve.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Automerge - -on: - pull_request_target - -jobs: - auto-merge: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v2 - - - uses: ahmadnassri/action-dependabot-auto-merge@v2 - with: - target: minor - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml new file mode 100644 index 0000000..7fba2f4 --- /dev/null +++ b/.github/workflows/automerge.yaml @@ -0,0 +1,16 @@ +name: Automerge + +on: + pull_request_target: + +jobs: + auto-merge: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + steps: + - + uses: actions/checkout@v2 + - + uses: ahmadnassri/action-dependabot-auto-merge@v2.3 + with: + github-token: ${{ secrets.token }} From 5df359d8430f9419daed33e415b78367e41a0bdc Mon Sep 17 00:00:00 2001 From: Niels Hofmans Date: Sat, 3 Apr 2021 13:43:00 +0200 Subject: [PATCH 8/8] Update automerge.yaml --- .github/workflows/automerge.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml index 7fba2f4..7c8a462 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/automerge.yaml @@ -11,6 +11,6 @@ jobs: - uses: actions/checkout@v2 - - uses: ahmadnassri/action-dependabot-auto-merge@v2.3 + uses: ahmadnassri/action-dependabot-auto-merge@v2.4 with: github-token: ${{ secrets.token }}