Skip to content

Commit

Permalink
Reduce scope of docker-compose setup
Browse files Browse the repository at this point in the history
  • Loading branch information
tyler-sommer committed Oct 25, 2017
1 parent 0af74dd commit 2d105d4
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 1,725 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -102,7 +102,7 @@ Some tips:
Docker support
--------------

Packages comes with an example `docker-compose.yml` that sets up the necessary web and Redis server, along with the option to create a self-hosted GitLab with a Highly-Available Redis configuration.
Packages comes with an example `docker-compose.yml` that starts an nginx container and a Redis container, ready to get up and running quickly.

Visit [the documentation](http://docs.terramarlabs.com/packages/3.2/getting-started/docker) to get started.

Expand Down
35 changes: 2 additions & 33 deletions docker-compose.yml
Expand Up @@ -6,44 +6,13 @@ services:
- .:/app
- ./docker/nginx/vhost.common.d/vhost.common.conf:/opt/docker/etc/nginx/vhost.common.d/10-location-root.conf
links:
- redis-master
# - redis-slave # Uncomment to start a slave Redis container
# - gitlab # Uncomment to start a GitLab CE container (starts mailhog, too)
- redis
environment:
- WEB_DOCUMENT_ROOT=/app/web
ports:
- "127.0.0.1:80:80" # Access Packages in your browser at http://127.0.0.1:80
- "127.0.0.1:443:443" # Access Packages in your browser at https://127.0.0.1:443
redis-master:
redis:
image: redis:3.2
volumes:
- ./docker/redis/sentinel.conf:/etc/redis/sentinel.conf.orig
- ./docker/redis/entrypoint_master.sh:/entrypoint.sh
command: /entrypoint.sh
expose:
- "26379"
- "6379"
redis-slave:
image: redis:3.2
volumes:
- ./docker/redis/sentinel.conf:/etc/redis/sentinel.conf.orig
- ./docker/redis/entrypoint_slave.sh:/entrypoint.sh
command: /entrypoint.sh
links:
- redis-master
expose:
- "26379"
- "6379"
gitlab:
image: gitlab/gitlab-ce:9.5.8-ce.0
volumes:
- ./docker/gitlab/gitlab.rb:/etc/gitlab/gitlab.rb
links:
- redis-master
- mailhog
ports:
- "127.0.0.1:8082:80" # Access GitLab in your browser at http://127.0.0.1:8082
mailhog:
image: mailhog/mailhog
ports:
- "127.0.0.1:8025:8025" # Access MailHog UI in your browser at http://127.0.0.1:8025

0 comments on commit 2d105d4

Please sign in to comment.