diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e4b01f..051091e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,6 @@ linting: image: divio/lint stage: qa needs: [] - allow_failure: true script: - find . -type f diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..eda1882 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +lint: + find . -type f -name Dockerfile -not -path './EOL-*' -print0 | \ + xargs -0 -I% \ + docker run -v $(shell pwd):/app -e LINT_FILE_DOCKER=% divio/lint \ + /bin/lint --run=docker diff --git a/py3.11-alpine3.18/Dockerfile b/py3.11-alpine3.18/Dockerfile index 3d114da..e735b47 100644 --- a/py3.11-alpine3.18/Dockerfile +++ b/py3.11-alpine3.18/Dockerfile @@ -1,3 +1,4 @@ +# hadolint global ignore=DL3059 FROM python:3.11-alpine3.18 AS build ARG TARGET=prod @@ -7,7 +8,7 @@ RUN apk update && apk upgrade # Dependencies # hadolint ignore=DL3018 -RUN apk add \ +RUN apk add --no-cache \ curl \ freetype \ gdal \ @@ -31,7 +32,7 @@ RUN apk add \ yaml # hadolint ignore=DL3018 -RUN if [ "$TARGET" = "dev" ] ; then apk add \ +RUN if [ "$TARGET" = "dev" ] ; then apk add --no-cache \ autoconf \ automake \ blas-dev \ diff --git a/py3.7-alpine3.12/Dockerfile b/py3.7-alpine3.12/Dockerfile index ae5f843..44d357e 100644 --- a/py3.7-alpine3.12/Dockerfile +++ b/py3.7-alpine3.12/Dockerfile @@ -8,7 +8,7 @@ RUN apk update && apk upgrade # Dependencies # hadolint ignore=DL3018 -RUN apk add \ +RUN apk add --no-cache \ blas \ cairo \ curl \ @@ -34,7 +34,7 @@ RUN apk add \ yaml # hadolint ignore=DL3018 -RUN if [ "$TARGET" = "dev" ] ; then apk add \ +RUN if [ "$TARGET" = "dev" ] ; then apk add --no-cache \ autoconf \ automake \ cairo-dev \ diff --git a/py3.9-alpine3.13/Dockerfile b/py3.9-alpine3.13/Dockerfile index 894fa2d..d7e530e 100644 --- a/py3.9-alpine3.13/Dockerfile +++ b/py3.9-alpine3.13/Dockerfile @@ -1,3 +1,4 @@ +# hadolint global ignore=DL3059 FROM python:3.9.9-alpine3.13 AS build ARG TARGET=prod @@ -7,7 +8,7 @@ RUN apk update && apk upgrade # Dependencies # hadolint ignore=DL3018 -RUN apk add \ +RUN apk add --no-cache \ blas \ curl \ freetype \ @@ -32,7 +33,7 @@ RUN apk add \ yaml # hadolint ignore=DL3018 -RUN if [ "$TARGET" = "dev" ] ; then apk add \ +RUN if [ "$TARGET" = "dev" ] ; then apk add --no-cache \ autoconf \ automake \ blas-dev \