fixed docker lint

This commit is contained in:
André Bauer 2020-02-26 23:03:13 +01:00
parent 97b8b87caa
commit 80838312ee
4 changed files with 6 additions and 2 deletions

View File

@ -1,4 +1,3 @@
MAINTAINER Zammad <info@zammad.org>
ARG BUILD_DATE ARG BUILD_DATE
LABEL org.label-schema.build-date="$BUILD_DATE" \ LABEL org.label-schema.build-date="$BUILD_DATE" \

View File

@ -12,4 +12,6 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.schema-version="3.2.0" \ org.label-schema.schema-version="3.2.0" \
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
RUN yes | /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment RUN yes | /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment

View File

@ -13,6 +13,8 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.schema-version="3.2.0" \ org.label-schema.schema-version="3.2.0" \
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
# copy backup script # copy backup script
COPY containers/zammad-postgresql/backup.sh /usr/local/bin/ COPY containers/zammad-postgresql/backup.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/backup.sh RUN chmod +x /usr/local/bin/backup.sh

View File

@ -16,6 +16,8 @@ ENV ZAMMAD_READY_FILE ${ZAMMAD_DIR}/tmp/zammad.ready
ENV ZAMMAD_TMP_DIR /tmp/zammad-${GIT_BRANCH} ENV ZAMMAD_TMP_DIR /tmp/zammad-${GIT_BRANCH}
ENV ZAMMAD_USER zammad ENV ZAMMAD_USER zammad
SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
# install zammad # install zammad
COPY containers/zammad/setup.sh /tmp COPY containers/zammad/setup.sh /tmp
RUN chmod +x /tmp/setup.sh; \ RUN chmod +x /tmp/setup.sh; \
@ -24,7 +26,6 @@ RUN chmod +x /tmp/setup.sh; \
FROM ruby:2.5.5-slim FROM ruby:2.5.5-slim
MAINTAINER Zammad <info@zammad.org>
ARG BUILD_DATE ARG BUILD_DATE
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive