Freifunk-Rhein-Sieg/zammad-docker-compose
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed gosu gpg check for now as it constantly fails

Browse Source
This commit is contained in:
André Bauer 2018-12-06 23:35:11 +01:00
parent b10e627026
commit 87da0ed9f0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
containers/zammad-elasticsearch/Dockerfile
View File

@ -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

10
containers/zammad/Dockerfile
View File

@ -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