From 4fce2246d67edb97b9acc06597695050a3aa93e0 Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Thu, 4 Mar 2021 08:53:55 +0100 Subject: [PATCH] Update hadolint and no longer ignore SC2215 (#19) Signed-off-by: Felix Bartels --- .ci/setup-tools.sh | 2 +- core/Dockerfile | 2 +- kapps/Dockerfile | 1 - meet/Dockerfile | 1 - php/Dockerfile | 1 - python/Dockerfile | 1 - utils/Dockerfile | 1 - webapp/Dockerfile | 2 +- zpush/Dockerfile | 2 +- 9 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.ci/setup-tools.sh b/.ci/setup-tools.sh index d3c216b..400ea1d 100755 --- a/.ci/setup-tools.sh +++ b/.ci/setup-tools.sh @@ -6,7 +6,7 @@ IFS=$'\n\t' COMMANDER_VERSION=2.1.0 DOCKER_COMPOSE_VERSION=1.25.5 GOSS_VERSION=0.3.11 -HADOLINT_VERSION=1.17.6 +HADOLINT_VERSION=1.23.0 REG_VERSION=0.16.1 SHELLCHECK_VERSION=0.7.1 diff --git a/core/Dockerfile b/core/Dockerfile index c65acb6..3670146 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -41,7 +41,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # install Kopano Core and refresh ca-certificates # hadolint currently does not understand the extended buildkit syntax https://github.com/hadolint/hadolint/issues/347 -# hadolint ignore=SC2215,DL3015 +# hadolint ignore=DL3015 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # apt key for this repo has already been installed in base echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ diff --git a/kapps/Dockerfile b/kapps/Dockerfile index f23a7d9..29ef005 100644 --- a/kapps/Dockerfile +++ b/kapps/Dockerfile @@ -29,7 +29,6 @@ LABEL maintainer=az@zok.xyz \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# hadolint ignore=SC2215 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # apt key for this repo has already been installed in base echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_KAPPS_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ diff --git a/meet/Dockerfile b/meet/Dockerfile index e45f4b0..051a17c 100644 --- a/meet/Dockerfile +++ b/meet/Dockerfile @@ -30,7 +30,6 @@ LABEL maintainer=az@zok.xyz \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# hadolint ignore=SC2215 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # apt key for this repo has already been installed in base # community download and package as apt source repository diff --git a/php/Dockerfile b/php/Dockerfile index 200ab7a..ce76c1e 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -29,7 +29,6 @@ LABEL maintainer=az@zok.xyz \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # add install common php dependencies -# hadolint ignore=SC2215 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # apt key for this repo has already been installed in base echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ diff --git a/python/Dockerfile b/python/Dockerfile index fdb46d7..7238eb5 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -26,7 +26,6 @@ LABEL maintainer=az@zok.xyz \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# hadolint ignore=SC2215 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ # install diff --git a/utils/Dockerfile b/utils/Dockerfile index fd4bb9f..1f049b5 100644 --- a/utils/Dockerfile +++ b/utils/Dockerfile @@ -10,7 +10,6 @@ LABEL maintainer=az@zok.xyz \ org.label-schema.version=$KOPANO_CORE_VERSION \ org.label-schema.schema-version="1.0" -# hadolint ignore=SC2215 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ apt-get update && apt-get install --no-install-recommends -y \ git \ diff --git a/webapp/Dockerfile b/webapp/Dockerfile index b0d1564..a882ab3 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -40,7 +40,7 @@ LABEL maintainer=az@zok.xyz \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # install Kopano WebApp -# hadolint ignore=SC2129,SC2215 +# hadolint ignore=SC2129 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # community download and package as apt source repository # TODO is it neccesary to source this file here? was already sourced before diff --git a/zpush/Dockerfile b/zpush/Dockerfile index e21c76d..1cdbd88 100644 --- a/zpush/Dockerfile +++ b/zpush/Dockerfile @@ -35,7 +35,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # install Z-Push # hadolint currently does not understand the extended buildkit syntax https://github.com/hadolint/hadolint/issues/347 -# hadolint ignore=SC2215,DL3015 +# hadolint ignore=DL3015 RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ # prepare z-push installation echo "deb ${KOPANO_ZPUSH_REPOSITORY_URL} /" > /etc/apt/sources.list.d/zpush.list && \