From 4f8af8f86f122542029e40c23e8a3a8c563a9fb0 Mon Sep 17 00:00:00 2001
From: Felix Bartels <1257835+fbartels@users.noreply.github.com>
Date: Thu, 5 Dec 2019 11:10:17 +0100
Subject: [PATCH] update konnect (#299)

* 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
---
 build/Dockerfile   | 3 ++-
 konnect/Dockerfile | 2 +-
 konnect/wrapper.sh | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 667b9ea..a0881d0 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:18.09.6
+FROM docker:18.09
 ENV \
     COMMANDER_VERSION=1.2.1 \
     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://raw.githubusercontent.com/fbartels/dccommander/master/dccommander" -o /usr/local/bin/dccommander && \
     pip install yamllint==1.19.0 && \
+    npm config set unsafe-perm true && \
     npm install -g eclint@2.8.1 && \
     chmod a+x /usr/local/bin/*
 
diff --git a/konnect/Dockerfile b/konnect/Dockerfile
index e6099b4..04e699f 100644
--- a/konnect/Dockerfile
+++ b/konnect/Dockerfile
@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.26.0
+ARG CODE_VERSION=0.28.0
 FROM kopano/konnectd:${CODE_VERSION}
 
 ARG VCS_REF
diff --git a/konnect/wrapper.sh b/konnect/wrapper.sh
index d43028c..ed5929f 100755
--- a/konnect/wrapper.sh
+++ b/konnect/wrapper.sh
@@ -122,6 +122,11 @@ if [ -n "${uri_base_path:-}" ]; then
 	set -- "$@" --uri-base-path="$uri_base_path"
 fi
 
+if [ -n "${signing_method:-}" ]; then
+	echo "Entrypoint: Setting signing_method to $signing_method"
+	set -- "$@" --signing-method="$signing_method"
+fi
+
 if [ "${insecure:-}" = "yes" ]; then
 	echo "Entrypoint: running Konnect in insecure mode"
 	set -- "$@" "--insecure"