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

update konnect (#299)

Browse Source 
* update konnect to 0.28.0
* make signing_method configurable
* instruct npm to run with unsafe permissions (fixes error on jenkins)
  * https://github.com/npm/npm/issues/20861
This commit is contained in:
Felix Bartels 2019-12-05 11:10:17 +01:00 committed by GitHub
parent 7eab9c7c06
commit 4f8af8f86f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker:18.09.6 FROM docker:18.09
ENV \ ENV \
COMMANDER_VERSION=1.2.1 \ COMMANDER_VERSION=1.2.1 \
COMPOSE_VERSION=1.19.0 \ COMPOSE_VERSION=1.19.0 \
@ -26,6 +26,7 @@ RUN curl -fSL "https://github.com/genuinetools/reg/releases/download/v$REG_VERSI
curl -fSL "https://github.com/SimonBaeumer/commander/releases/download/v$COMMANDER_VERSION/commander-linux-amd64" -o /usr/local/bin/commander && \ curl -fSL "https://github.com/SimonBaeumer/commander/releases/download/v$COMMANDER_VERSION/commander-linux-amd64" -o /usr/local/bin/commander && \
curl -fSL "https://raw.githubusercontent.com/fbartels/dccommander/master/dccommander" -o /usr/local/bin/dccommander && \ curl -fSL "https://raw.githubusercontent.com/fbartels/dccommander/master/dccommander" -o /usr/local/bin/dccommander && \
pip install yamllint==1.19.0 && \ pip install yamllint==1.19.0 && \
npm config set unsafe-perm true && \
npm install -g eclint@2.8.1 && \ npm install -g eclint@2.8.1 && \
chmod a+x /usr/local/bin/* chmod a+x /usr/local/bin/*

2
konnect/Dockerfile
View File

@ -1,4 +1,4 @@
ARG CODE_VERSION=0.26.0 ARG CODE_VERSION=0.28.0
FROM kopano/konnectd:${CODE_VERSION} FROM kopano/konnectd:${CODE_VERSION}
ARG VCS_REF ARG VCS_REF

5
konnect/wrapper.sh
View File

@ -122,6 +122,11 @@ if [ -n "${uri_base_path:-}" ]; then
set -- "$@" --uri-base-path="$uri_base_path" set -- "$@" --uri-base-path="$uri_base_path"
fi fi
if [ -n "${signing_method:-}" ]; then
echo "Entrypoint: Setting signing_method to $signing_method"
set -- "$@" --signing-method="$signing_method"
fi
if [ "${insecure:-}" = "yes" ]; then if [ "${insecure:-}" = "yes" ]; then
echo "Entrypoint: running Konnect in insecure mode" echo "Entrypoint: running Konnect in insecure mode"
set -- "$@" "--insecure" set -- "$@" "--insecure"