Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/elgohr/Publish-D…
Browse files Browse the repository at this point in the history
…ocker-Github-Action-3.03
hazcod authored Apr 3, 2021
2 parents 88d06bf + 7e9dacd commit e6e05c4
Showing 3 changed files with 19 additions and 12 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
@@ -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.4
with:
github-token: ${{ secrets.token }}
9 changes: 0 additions & 9 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -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 }}"
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# 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/
RUN CGO_ENABLED=0 GO111MODULE=auto go build -trimpath -ldflags '-w -s -extldflags "-static"' -o /healthcheck /go/src/healthcheck/

#
# ---
#

# 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

0 comments on commit e6e05c4

Please sign in to comment.