dcarrillo/docker-nginx
1
0
Fork 0
mirror of https://github.com/dcarrillo/docker-nginx.git synced 2025-01-06 20:16:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #11 from dcarrillo/1.19.1

Browse Source
This commit is contained in:
github-actions[bot] 2020-07-11 10:36:33 +00:00 committed by GitHub
commit c7a4b1a3ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/automerge.yml vendored Normal file
View File

@ -0,0 +1,30 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: automerge
uses: "pascalgn/automerge-action@4536e8847eb62fe2f0ee52c8fa92d17aa97f932f"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_RETRIES: 30
MERGE_RETRY_SLEEP: 10000
MERGE_METHOD: merge

2
.github/workflows/main.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: shellcheck - name: shellcheck
uses: azohra/shell-linter@v0.3.0 uses: azohra/shell-linter@v0.4.0
- name: hadolint - name: hadolint
uses: brpaz/hadolint-action@master uses: brpaz/hadolint-action@master

2
conf.env
View File

@ -1,3 +1,3 @@
NGINX_VERSION=1.18.0 NGINX_VERSION=1.19.1
NGX_GEOIP2_VERSION=3.3 NGX_GEOIP2_VERSION=3.3
DOCKER_IMAGE=dcarrillo/nginx DOCKER_IMAGE=dcarrillo/nginx