mirror of
https://github.com/dcarrillo/docker-nginx.git
synced 2025-01-06 20:16:48 +00:00
Merge pull request #7 from dcarrillo/linting
Add linting at github actions
This commit is contained in:
commit
a46c62a46b
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
@ -14,6 +14,12 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
|
|
||||||
|
- name: shellcheck
|
||||||
|
uses: azohra/shell-linter@v0.1.0
|
||||||
|
|
||||||
|
- name: hadolint
|
||||||
|
uses: brpaz/hadolint-action@master
|
||||||
|
|
||||||
- name: Build image
|
- name: Build image
|
||||||
run: ./build.sh
|
run: ./build.sh
|
||||||
|
|
||||||
|
@ -6,7 +6,8 @@ ARG ARG_NGX_GEOIP2_VERSION
|
|||||||
ENV NGINX_VERSION $ARG_NGINX_VERSION
|
ENV NGINX_VERSION $ARG_NGINX_VERSION
|
||||||
ENV NGX_GEOIP2_VERSION $ARG_NGX_GEOIP2_VERSION
|
ENV NGX_GEOIP2_VERSION $ARG_NGX_GEOIP2_VERSION
|
||||||
|
|
||||||
RUN CONFIG="\
|
# hadolint ignore=DL3018,DL3003,SC2086
|
||||||
|
RUN CONFIG=" \
|
||||||
--add-module=/tmp/ngx_http_geoip2_module-$NGX_GEOIP2_VERSION \
|
--add-module=/tmp/ngx_http_geoip2_module-$NGX_GEOIP2_VERSION \
|
||||||
--with-stream \
|
--with-stream \
|
||||||
--with-http_ssl_module \
|
--with-http_ssl_module \
|
||||||
|
1
build.sh
1
build.sh
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
# shellcheck disable=SC1090
|
||||||
. "$(dirname "$0")"/conf.env
|
. "$(dirname "$0")"/conf.env
|
||||||
|
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
|
@ -6,11 +6,13 @@ if [ x"$DEBUG" = xtrue ]; then
|
|||||||
set -x
|
set -x
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# shellcheck disable=SC2039
|
||||||
trap _catch_err ERR
|
trap _catch_err ERR
|
||||||
trap _cleanup EXIT
|
trap _cleanup EXIT
|
||||||
|
|
||||||
ALPINE_VERSION="alpine:3.11"
|
ALPINE_VERSION="alpine:3.11"
|
||||||
LOCAL_DIR="$(cd "$(dirname "$0")" ; pwd -P)"
|
LOCAL_DIR="$(cd "$(dirname "$0")" ; pwd -P)"
|
||||||
|
# shellcheck disable=SC1090
|
||||||
. "$LOCAL_DIR"/../conf.env
|
. "$LOCAL_DIR"/../conf.env
|
||||||
|
|
||||||
TMP_DIR=$(mktemp -d)
|
TMP_DIR=$(mktemp -d)
|
||||||
|
Loading…
Reference in New Issue
Block a user