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

Merge branch 'master' into develop/changes-for-zammad-5.1

Browse Source
This commit is contained in:
André Bauer 2022-01-27 01:27:16 +01:00 committed by GitHub
commit 60a6fc202f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -5,4 +5,4 @@ POSTGRES_USER=zammad
REDIS_URL=redis://zammad-redis:6379 REDIS_URL=redis://zammad-redis:6379
RESTART=always RESTART=always
# don't forget to add the minus before the version # don't forget to add the minus before the version
VERSION=-5.0.2-1 VERSION=-5.0.3-7

2
Dockerfile
View File

@ -8,5 +8,5 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \
org.label-schema.vendor="Zammad" \ org.label-schema.vendor="Zammad" \
org.label-schema.schema-version="5.0.1" \ org.label-schema.schema-version="5.0.3" \
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"

4
containers/zammad-elasticsearch/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:7.15.1 FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.2
ARG BUILD_DATE ARG BUILD_DATE
LABEL org.label-schema.build-date="$BUILD_DATE" \ LABEL org.label-schema.build-date="$BUILD_DATE" \
@ -9,7 +9,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \
org.label-schema.vendor="Zammad" \ org.label-schema.vendor="Zammad" \
org.label-schema.schema-version="5.0.1" \ org.label-schema.schema-version="5.0.3" \
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"] SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]

2
containers/zammad-postgresql/Dockerfile
View File

@ -10,7 +10,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \
org.label-schema.vendor="Zammad" \ org.label-schema.vendor="Zammad" \
org.label-schema.schema-version="5.0.1" \ org.label-schema.schema-version="5.0.3" \
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"] SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]

2
containers/zammad/Dockerfile
View File

@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \
org.label-schema.vendor="Zammad" \ org.label-schema.vendor="Zammad" \
org.label-schema.schema-version="5.0.1" \ org.label-schema.schema-version="5.0.3" \
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"
ENV GIT_BRANCH stable ENV GIT_BRANCH stable