moved to dockerhub images

This commit is contained in:
André Bauer 2017-01-05 20:10:08 +01:00
parent 13e87508f1
commit fdd69d924c
6 changed files with 15 additions and 15 deletions

View File

@ -4,7 +4,7 @@ ARG BUILD_DATE
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" \
org.label-schema.license="AGPL-3.0" \ org.label-schema.license="AGPL-3.0" \
org.label-schema.description="Docker container for Zammad - dummy Dockerfile for DockerHub autobuilds" \ org.label-schema.description="Docker container for Zammad - Dummy Dockerfile for DockerHub autobuilds" \
org.label-schema.url="https://zammad.org" \ 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/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \

View File

@ -5,7 +5,7 @@ ARG BUILD_DATE
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" \
org.label-schema.license="AGPL-3.0" \ org.label-schema.license="AGPL-3.0" \
org.label-schema.description="Docker container for Zammad - elasticsearch" \ org.label-schema.description="Docker container for Zammad - Elasticsearch" \
org.label-schema.url="https://zammad.org" \ 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/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \

View File

@ -5,7 +5,7 @@ ARG BUILD_DATE
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" \
org.label-schema.license="AGPL-3.0" \ org.label-schema.license="AGPL-3.0" \
org.label-schema.description="Docker container for Zammad - nginx" \ org.label-schema.description="Docker container for Zammad - Nginx" \
org.label-schema.url="https://zammad.org" \ 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/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \

View File

@ -5,7 +5,7 @@ ARG BUILD_DATE
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" \
org.label-schema.license="AGPL-3.0" \ org.label-schema.license="AGPL-3.0" \
org.label-schema.description="Docker container for Zammad - postgresql" \ org.label-schema.description="Docker container for Zammad - Postgresql" \
org.label-schema.url="https://zammad.org" \ 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/zammad/zammad" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \

View File

@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school, You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary. if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>. <http://www.gnu.org/licenses/>.

View File

@ -1,15 +1,15 @@
version: '2' version: '2'
services: services:
postgresql: postgresql:
image: postgres image: monotek/zammad-docker-compose:postgresql
volumes:
- data-postgresql:/var/lib/psql
elasticsearch: elasticsearch:
build: image: monotek/zammad-docker-compose:elasticsearch
context: . volumes:
dockerfile: Dockerfile.elasticsearch - data-elasticsearch:/var/lib/elasticsearch
zammad: zammad:
build: image: monotek/zammad-docker-compose:zammad
context: .
dockerfile: Dockerfile.zammad
links: links:
- postgresql - postgresql
- elasticsearch - elasticsearch
@ -20,9 +20,7 @@ services:
- data-zammad:/home/zammad - data-zammad:/home/zammad
- data-ruby:/usr/local - data-ruby:/usr/local
nginx: nginx:
build: image: monotek/zammad-docker-compose:nginx
context: .
dockerfile: Dockerfile.nginx
ports: ports:
- "80:80" - "80:80"
links: links:
@ -32,6 +30,8 @@ services:
volumes: volumes:
- data-zammad:/home/zammad - data-zammad:/home/zammad
volumes: volumes:
data-elasticsearch:
driver: local
data-postgresql: data-postgresql:
driver: local driver: local
data-ruby: data-ruby: