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

changed maintainer info, changed dockerhub repo in hooks & changed docker image users to zammad

Browse Source
This commit is contained in:
André Bauer 2017-01-08 13:00:11 +01:00
parent d38bc9cf49
commit 34f7f219fb
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
MAINTAINER André Bauer <monotek23@gmail.com> 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" \

2
Dockerfile.elasticsearch
View File

@ -1,5 +1,5 @@
FROM elasticsearch FROM elasticsearch
MAINTAINER André Bauer <monotek23@gmail.com> 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" \

2
Dockerfile.nginx
View File

@ -1,5 +1,5 @@
FROM nginx FROM nginx
MAINTAINER André Bauer <monotek23@gmail.com> 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" \

2
Dockerfile.postgresql
View File

@ -1,5 +1,5 @@
FROM postgres FROM postgres
MAINTAINER André Bauer <monotek23@gmail.com> 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" \

6
Dockerfile.zammad
View File

@ -1,5 +1,5 @@
FROM ruby:2.3.1 FROM ruby:2.3.1
MAINTAINER André Bauer <monotek23@gmail.com> MAINTAINER Zammad <info@zammad.org>
ARG BUILD_DATE ARG BUILD_DATE
ENV ZAMMAD_DIR /home/zammad ENV ZAMMAD_DIR /home/zammad
@ -7,9 +7,7 @@ ENV ZAMMAD_DEBUG no
ENV RAILS_ENV production ENV RAILS_ENV production
ENV RAILS_SERVER puma ENV RAILS_SERVER puma
ENV GIT_URL https://github.com/zammad/zammad.git ENV GIT_URL https://github.com/zammad/zammad.git
ENV GIT_BRANCH develop ENV GIT_BRANCH stable
#ENV GIT_URL https://github.com/monotek/zammad.git
#ENV GIT_BRANCH nulldb
LABEL org.label-schema.build-date="$BUILD_DATE" \ LABEL org.label-schema.build-date="$BUILD_DATE" \
org.label-schema.name="Zammad" \ org.label-schema.name="Zammad" \

8
docker-compose.yml
View File

@ -1,9 +1,9 @@
version: '2' version: '2'
services: services:
elasticsearch: elasticsearch:
image: monotek/zammad-docker-compose:elasticsearch image: zammad/zammad-docker-compose:elasticsearch
nginx: nginx:
image: monotek/zammad-docker-compose:nginx image: zammad/zammad-docker-compose:nginx
ports: ports:
- "80:80" - "80:80"
links: links:
@ -13,9 +13,9 @@ services:
volumes: volumes:
- data-zammad:/home/zammad - data-zammad:/home/zammad
postgresql: postgresql:
image: monotek/zammad-docker-compose:postgresql image: zammad/zammad-docker-compose:postgresql
zammad: zammad:
image: monotek/zammad-docker-compose:zammad image: zammad/zammad-docker-compose:zammad
links: links:
- postgresql - postgresql
- elasticsearch - elasticsearch

2
hooks/config
View File

@ -3,5 +3,5 @@
# build hooks config # build hooks config
# #
DOCKER_REPO="monotek/zammad-docker-compose" DOCKER_REPO="zammad/zammad-docker-compose"
DOCKER_IMAGES="elasticsearch nginx postgresql zammad" DOCKER_IMAGES="elasticsearch nginx postgresql zammad"