Commit 85365dcf authored by BAIRE Anthony's avatar BAIRE Anthony
Browse files

rename 'docker' container as 'controller'

parent b5ba033f
......@@ -12,15 +12,15 @@ dev-registry:
- "/data/dev/registry:/vol"
#TODO: configure a network ?
dev-docker:
container_name: dev-docker
dev-controller:
container_name: dev-controller
build: docker
#image: allgo/docker
build: controller
#image: allgo/controller
volumes:
- "/data/dev/docker:/vol"
- "./docker:/opt/allgo-docker"
- "/data/dev/controller:/vol"
- "./controller:/opt/allgo-docker"
- "/:/vol/host:ro"
environment:
......@@ -82,7 +82,7 @@ dev-rails:
links:
- dev-smtpsink
- dev-docker
- dev-controller
- dev-mysql
tty: true
......
export DOCKER_USER="`id -u`:`id -g`"
for ctr in registry rails docker ssh mysql smtpsink nginx
for ctr in registry rails controller ssh mysql smtpsink nginx
do
mkdir -p "./data/$ctr"
done
......@@ -49,7 +49,7 @@ module Allgo
# TCP (host, port) to contact the docker controller
if !config.respond_to? :docker_adapter
config.docker_adapter = "#{config.short_env}-docker", 4567
config.docker_adapter = "#{config.short_env}-controller", 4567
end
# Mailer configuration
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment