From 87da0ed9f0cb80182830755eec2bc2dfc2cce802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek23@gmail.com>
Date: Thu, 6 Dec 2018 23:35:11 +0100
Subject: [PATCH] removed gosu gpg check for now as it constantly fails

---
 containers/zammad-elasticsearch/Dockerfile |  4 ++--
 containers/zammad/Dockerfile               | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile
index f9dc9be..9f2d521 100644
--- a/containers/zammad-elasticsearch/Dockerfile
+++ b/containers/zammad-elasticsearch/Dockerfile
@@ -13,5 +13,5 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.schema-version="1.2" \
       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
 
-RUN /usr/share/elasticsearch/bin/elasticsearch-plugin remove x-pack --purge \
-    && yes | /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
+RUN /usr/share/elasticsearch/bin/elasticsearch-plugin remove x-pack --purge && \
+  yes | /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile
index 5a5168c..aa0cd61 100644
--- a/containers/zammad/Dockerfile
+++ b/containers/zammad/Dockerfile
@@ -30,11 +30,11 @@ RUN BUILD_DEPENDENCIES="build-essential ca-certificates curl dirmngr git gnupg2
   set -ex && \
   apt-get update && apt-get install -y --no-install-recommends ${BUILD_DEPENDENCIES} && rm -rf /var/lib/apt/lists/* && \
   curl -s -J -L -o /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture)" && \
-  curl -s -J -L -o /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture).asc" && \
-  export GNUPGHOME="$(mktemp -d)" && \
-  gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
-  gpg --no-tty --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
-  rm -rf "${GNUPGHOME}" /usr/local/bin/gosu.asc && \
+#  curl -s -J -L -o /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture).asc" && \
+#  export GNUPGHOME="$(mktemp -d)" && \
+#  gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
+#  gpg --no-tty --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
+#  rm -rf "${GNUPGHOME}" /usr/local/bin/gosu.asc && \
   chmod +x /usr/local/bin/gosu && \
   gosu nobody true