From 629958bf0a27f505040272bd692f4290948a4f25 Mon Sep 17 00:00:00 2001 From: Erick Guan Date: Thu, 7 Jan 2016 13:52:42 +0100 Subject: [PATCH] Using docker link over port in multi container samples --- samples/data.yml | 6 ------ samples/redis.yml | 5 ----- samples/standalone.yml | 1 - samples/web_only.yml | 17 ++++++++--------- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/samples/data.yml b/samples/data.yml index 2491f62..a38ffa0 100644 --- a/samples/data.yml +++ b/samples/data.yml @@ -5,12 +5,6 @@ templates: - "templates/postgres.template.yml" - "templates/redis.template.yml" - - "templates/sshd.template.yml" - -# change to use your private IP -expose: - - "10.0.0.1:5432:5432" - - "10.0.0.1:6379:6379" # any extra arguments for Docker? # docker_args: diff --git a/samples/redis.yml b/samples/redis.yml index 01dee6e..4086008 100644 --- a/samples/redis.yml +++ b/samples/redis.yml @@ -1,6 +1,5 @@ templates: - "templates/redis.template.yml" - - "templates/sshd.template.yml" env: LANG: en_US.UTF-8 @@ -8,10 +7,6 @@ env: # any extra arguments for Docker? # docker_args: -expose: - - "6379:6379" - - "2221:22" - volumes: - volume: host: /var/discourse/shared/redis diff --git a/samples/standalone.yml b/samples/standalone.yml index 2db2a83..4aac8c9 100644 --- a/samples/standalone.yml +++ b/samples/standalone.yml @@ -17,7 +17,6 @@ templates: - "templates/postgres.template.yml" - "templates/redis.template.yml" - "templates/web.template.yml" - - "templates/sshd.template.yml" - "templates/web.ratelimited.template.yml" ## which TCP/IP ports should this container expose? diff --git a/samples/web_only.yml b/samples/web_only.yml index 9a26a37..142fddf 100644 --- a/samples/web_only.yml +++ b/samples/web_only.yml @@ -2,7 +2,6 @@ # TODO: change SOME_SECRET in this template templates: - - "templates/sshd.template.yml" - "templates/web.template.yml" - "templates/web.ratelimited.template.yml" @@ -10,6 +9,12 @@ expose: - "80:80" - "2222:22" +# Use 'links' key to link containers together, aka use Docker --link flag. +links: + - link: + name: data + alias: data + # any extra arguments for Docker? # docker_args: @@ -28,8 +33,8 @@ env: DISCOURSE_DB_SOCKET: '' #DISCOURSE_DB_USERNAME: discourse DISCOURSE_DB_PASSWORD: SOME_SECRET - DISCOURSE_DB_HOST: DB_IP_ADDRESS - DISCOURSE_REDIS_HOST: REDIS_IP_ADDRESS + DISCOURSE_DB_HOST: data + DISCOURSE_REDIS_HOST: data ## ## TODO: List of comma delimited emails that will be made admin and developer ## on initial signup example 'user1@example.com,user2@example.com' @@ -55,12 +60,6 @@ volumes: host: /var/discourse/shared/web-only/log/var-log guest: /var/log -#Use 'links' key to link containers together, aka use Docker --link flag. -#links: -# - link: -# name: data -# alias: data - ## The docker manager plugin allows you to one-click upgrade Discouse ## http://discourse.example.com/admin/docker hooks: -- 2.25.1