From 34f7f219fbaac69cba876803b56704241ffad07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 8 Jan 2017 13:00:11 +0100 Subject: [PATCH] changed maintainer info, changed dockerhub repo in hooks & changed docker image users to zammad --- Dockerfile | 2 +- Dockerfile.elasticsearch | 2 +- Dockerfile.nginx | 2 +- Dockerfile.postgresql | 2 +- Dockerfile.zammad | 6 ++---- docker-compose.yml | 8 ++++---- hooks/config | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0017339..3771b61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -MAINTAINER André Bauer +MAINTAINER Zammad ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \ diff --git a/Dockerfile.elasticsearch b/Dockerfile.elasticsearch index a00a4f1..0e8dc5d 100644 --- a/Dockerfile.elasticsearch +++ b/Dockerfile.elasticsearch @@ -1,5 +1,5 @@ FROM elasticsearch -MAINTAINER André Bauer +MAINTAINER Zammad ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \ diff --git a/Dockerfile.nginx b/Dockerfile.nginx index e1c927c..f5b5f95 100644 --- a/Dockerfile.nginx +++ b/Dockerfile.nginx @@ -1,5 +1,5 @@ FROM nginx -MAINTAINER André Bauer +MAINTAINER Zammad ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \ diff --git a/Dockerfile.postgresql b/Dockerfile.postgresql index 234a50c..c03a633 100644 --- a/Dockerfile.postgresql +++ b/Dockerfile.postgresql @@ -1,5 +1,5 @@ FROM postgres -MAINTAINER André Bauer +MAINTAINER Zammad ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \ diff --git a/Dockerfile.zammad b/Dockerfile.zammad index 463042c..56e880e 100644 --- a/Dockerfile.zammad +++ b/Dockerfile.zammad @@ -1,5 +1,5 @@ FROM ruby:2.3.1 -MAINTAINER André Bauer +MAINTAINER Zammad ARG BUILD_DATE ENV ZAMMAD_DIR /home/zammad @@ -7,9 +7,7 @@ ENV ZAMMAD_DEBUG no ENV RAILS_ENV production ENV RAILS_SERVER puma ENV GIT_URL https://github.com/zammad/zammad.git -ENV GIT_BRANCH develop -#ENV GIT_URL https://github.com/monotek/zammad.git -#ENV GIT_BRANCH nulldb +ENV GIT_BRANCH stable LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.name="Zammad" \ diff --git a/docker-compose.yml b/docker-compose.yml index 77287ca..2cae7e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ version: '2' services: elasticsearch: - image: monotek/zammad-docker-compose:elasticsearch + image: zammad/zammad-docker-compose:elasticsearch nginx: - image: monotek/zammad-docker-compose:nginx + image: zammad/zammad-docker-compose:nginx ports: - "80:80" links: @@ -13,9 +13,9 @@ services: volumes: - data-zammad:/home/zammad postgresql: - image: monotek/zammad-docker-compose:postgresql + image: zammad/zammad-docker-compose:postgresql zammad: - image: monotek/zammad-docker-compose:zammad + image: zammad/zammad-docker-compose:zammad links: - postgresql - elasticsearch diff --git a/hooks/config b/hooks/config index fe8b7ef..c004e65 100644 --- a/hooks/config +++ b/hooks/config @@ -3,5 +3,5 @@ # build hooks config # -DOCKER_REPO="monotek/zammad-docker-compose" +DOCKER_REPO="zammad/zammad-docker-compose" DOCKER_IMAGES="elasticsearch nginx postgresql zammad"