1
0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-11 16:32:59 +00:00

Prepare usage of build secrets (#303)

* sort .gitignore and add apt_auth.conf to it
* add helper to setup.sh to create apt_auth.conf (user still needs to enter their own credentials)
   * only create apt_auth.conf in make if it doesn't already exist
* add tooling to core dockerfile and makefile to use build secrets
* add ignore for hadolint as mounting syntax is currently not supported so far
* update to latest docker on travis for buildkit support
* documentation
* sort gitignore
* add dockerfile syntax definition for build args
This commit is contained in:
Felix Bartels
2020-05-22 10:23:09 +02:00
committed by GitHub
parent 2974903dc5
commit 7a04c93219
17 changed files with 119 additions and 63 deletions
+7 -5
View File
@@ -1,3 +1,4 @@
# syntax = docker/dockerfile:1.0-experimental
ARG docker_repo=zokradonh
FROM ${docker_repo}/kopano_base
@@ -17,9 +18,10 @@ ENV \
KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \
KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \
KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \
RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD \
KOPANO_ZPUSH_REPOSITORY_URL=$KOPANO_ZPUSH_REPOSITORY_URL \
KOPANO_ZPUSH_VERSION=$KOPANO_ZPUSH_VERSION
KOPANO_ZPUSH_VERSION=$KOPANO_ZPUSH_VERSION \
LANG=en_US.UTF-8 \
RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD
LABEL maintainer=az@zok.xyz \
org.label-schema.name="Kopano Z-Push container" \
@@ -32,7 +34,9 @@ LABEL maintainer=az@zok.xyz \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# install Z-Push
RUN \
# TODO secret handling could go away when kopano_php is used as a base image
# hadolint ignore=SC2215
RUN --mount=type=secret,id=repocred,dst=/etc/apt/apt_auth.conf \
echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
# prepare z-push installation
echo "deb ${KOPANO_ZPUSH_REPOSITORY_URL} /" > /etc/apt/sources.list.d/zpush.list && \
@@ -96,8 +100,6 @@ EXPOSE 80/tcp
COPY start.sh /kopano/start.sh
ENV LANG en_US.UTF-8
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD [ "/kopano/start.sh" ]