diff --git a/.env b/.env index 04164ba..a6f9302 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -IMAGE_REPO=zammad/zammad-docker-compose +IMAGE_REPO=colpari/zammad-docker-compose POSTGRES_PASS=zammad POSTGRES_USER=zammad RESTART=always # don't forget to add the minus before the version -VERSION=-3.6.0-20 +VERSION=-3.6.0-20c diff --git a/Dockerfile b/Dockerfile index 4708c9b..9492c92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.license="AGPL-3.0" \ org.label-schema.description="Docker container for Zammad - Dummy Dockerfile for DockerHub autobuilds" \ org.label-schema.url="https://zammad.org" \ - org.label-schema.vcs-url="https://github.com/zammad/zammad" \ + org.label-schema.vcs-url="https://github.com/colpari/zammad" \ org.label-schema.vcs-type="Git" \ - org.label-schema.vendor="Zammad" \ + org.label-schema.vendor="colpari" \ org.label-schema.schema-version="3.6.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile index d1c4784..c8c36fc 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -6,9 +6,9 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.license="AGPL-3.0" \ org.label-schema.description="Docker container for Zammad - Elasticsearch" \ org.label-schema.url="https://zammad.org" \ - org.label-schema.vcs-url="https://github.com/zammad/zammad" \ + org.label-schema.vcs-url="https://github.com/colpari/zammad" \ org.label-schema.vcs-type="Git" \ - org.label-schema.vendor="Zammad" \ + org.label-schema.vendor="colpari" \ org.label-schema.schema-version="3.6.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" diff --git a/containers/zammad-postgresql/Dockerfile b/containers/zammad-postgresql/Dockerfile index eaf2906..2566ae0 100644 --- a/containers/zammad-postgresql/Dockerfile +++ b/containers/zammad-postgresql/Dockerfile @@ -7,9 +7,9 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.license="AGPL-3.0" \ org.label-schema.description="Docker container for Zammad - Postgresql" \ org.label-schema.url="https://zammad.org" \ - org.label-schema.vcs-url="https://github.com/zammad/zammad" \ + org.label-schema.vcs-url="https://github.com/colpari/zammad" \ org.label-schema.vcs-type="Git" \ - org.label-schema.vendor="Zammad" \ + org.label-schema.vendor="colpari" \ org.label-schema.schema-version="3.6.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index 379bfc3..fe548f9 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -5,10 +5,10 @@ FROM ruby:2.6.6-slim AS builder ARG BUILD_DATE ARG DEBIAN_FRONTEND=noninteractive -ENV GIT_BRANCH stable +ENV GIT_BRANCH colpari-develop ENV GIT_URL ${PROJECT_URL}.git ENV GOSU_VERSION 1.11 -ENV PROJECT_URL https://github.com/zammad/zammad +ENV PROJECT_URL https://github.com/colpari/zammad ENV RAILS_ENV production ENV TAR_GZ_URL ${PROJECT_URL}/archive/${GIT_BRANCH}.tar.gz ENV ZAMMAD_DIR /opt/zammad @@ -34,13 +34,13 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.license="AGPL-3.0" \ org.label-schema.description="Docker container for Zammad - Data Container" \ org.label-schema.url="https://zammad.org" \ - org.label-schema.vcs-url="https://github.com/zammad/zammad" \ + org.label-schema.vcs-url="https://github.com/colpari/zammad" \ org.label-schema.vcs-type="Git" \ - org.label-schema.vendor="Zammad" \ + org.label-schema.vendor="colpari" \ org.label-schema.schema-version="3.6.0" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" -ENV GIT_BRANCH stable +ENV GIT_BRANCH colpari-develop ENV RAILS_ENV production ENV ZAMMAD_DIR /opt/zammad ENV ZAMMAD_READY_FILE ${ZAMMAD_DIR}/tmp/zammad.ready