flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-06 23:46:24 +00:00
Code Issues Releases Wiki Activity

Update hadolint and no longer ignore SC2215 (#19)

Browse Source 
Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2021-03-04 08:53:55 +01:00 committed by GitHub
parent 841d181402
commit 4fce2246d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/setup-tools.sh
View File

@ -6,7 +6,7 @@ IFS=$'\n\t'
COMMANDER_VERSION=2.1.0 COMMANDER_VERSION=2.1.0
DOCKER_COMPOSE_VERSION=1.25.5 DOCKER_COMPOSE_VERSION=1.25.5
GOSS_VERSION=0.3.11 GOSS_VERSION=0.3.11
HADOLINT_VERSION=1.17.6 HADOLINT_VERSION=1.23.0
REG_VERSION=0.16.1 REG_VERSION=0.16.1
SHELLCHECK_VERSION=0.7.1 SHELLCHECK_VERSION=0.7.1

2
core/Dockerfile
View File

@ -41,7 +41,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# install Kopano Core and refresh ca-certificates # install Kopano Core and refresh ca-certificates
# hadolint currently does not understand the extended buildkit syntax https://github.com/hadolint/hadolint/issues/347 # 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 \ 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 # 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; \ echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \

1
kapps/Dockerfile
View File

@ -29,7 +29,6 @@ LABEL maintainer=az@zok.xyz \
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=SC2215
RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ 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 # 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; \ echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_KAPPS_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \

1
meet/Dockerfile
View File

@ -30,7 +30,6 @@ LABEL maintainer=az@zok.xyz \
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=SC2215
RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ 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 # apt key for this repo has already been installed in base
# community download and package as apt source repository # community download and package as apt source repository

1
php/Dockerfile
View File

@ -29,7 +29,6 @@ LABEL maintainer=az@zok.xyz \
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# add install common php dependencies # add install common php dependencies
# hadolint ignore=SC2215
RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ 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 # 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; \ echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \

1
python/Dockerfile
View File

@ -26,7 +26,6 @@ LABEL maintainer=az@zok.xyz \
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=SC2215
RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ 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; \ echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
# install # install

1
utils/Dockerfile
View File

@ -10,7 +10,6 @@ LABEL maintainer=az@zok.xyz \
org.label-schema.version=$KOPANO_CORE_VERSION \ org.label-schema.version=$KOPANO_CORE_VERSION \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
# hadolint ignore=SC2215
RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
apt-get update && apt-get install --no-install-recommends -y \ apt-get update && apt-get install --no-install-recommends -y \
git \ git \

2
webapp/Dockerfile
View File

@ -40,7 +40,7 @@ LABEL maintainer=az@zok.xyz \
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# install Kopano WebApp # install Kopano WebApp
# hadolint ignore=SC2129,SC2215 # hadolint ignore=SC2129
RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \ RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
# community download and package as apt source repository # community download and package as apt source repository
# TODO is it neccesary to source this file here? was already sourced before # TODO is it neccesary to source this file here? was already sourced before

2
zpush/Dockerfile
View File

@ -35,7 +35,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# install Z-Push # install Z-Push
# hadolint currently does not understand the extended buildkit syntax https://github.com/hadolint/hadolint/issues/347 # 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 \ RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
# prepare z-push installation # prepare z-push installation
echo "deb ${KOPANO_ZPUSH_REPOSITORY_URL} /" > /etc/apt/sources.list.d/zpush.list && \ echo "deb ${KOPANO_ZPUSH_REPOSITORY_URL} /" > /etc/apt/sources.list.d/zpush.list && \