Commit b723bdba authored by BAIRE Anthony's avatar BAIRE Anthony
Browse files

fix .env file

- rename DOCKER_USER as DOCKERUSER (docker-compose seems to fail with
  varnames containing underscores)
- remove quotes
parent dab8d515
......@@ -80,7 +80,7 @@ it is tricky to use a relative path with the allgo/docker image).
For convenience, all containers not running as root (rails, mysql, registry)
have their user overridden to the UID:GID of the developer running
docker-compose. This is managed with the `DOCKER_USER` environment variable set
docker-compose. This is managed with the `DOCKERUSER` environment variable set
[in the `.env`
file](https://docs.docker.com/compose/environment-variables/#the-env-file) by
`prepare.sh`.
......
......@@ -14,7 +14,7 @@ services:
build: registry
#image: allgo/registry
user: "$DOCKER_USER"
user: "$DOCKERUSER"
ports:
- "127.0.0.1:8000-8002:8000-8002"
......@@ -48,7 +48,7 @@ services:
container_name: dev-mysql
build: mysql
#image: allgo/mysql
user: "$DOCKER_USER"
user: "$DOCKERUSER"
volumes:
- "/data/dev/mysql:/vol"
......@@ -78,7 +78,7 @@ services:
build: rails
#image: allgo/rails
user: "$DOCKER_USER"
user: "$DOCKERUSER"
ports:
- "127.0.0.1:3000:8080"
......
......@@ -13,7 +13,7 @@ else
# generate a .env file for docker-compose
cat >".env.tmp" <<EOF
DOCKER_USER="`id -u`:`id -g`"
DOCKERUSER=`id -u`:`id -g`
EOF
if [ ! -e .env ] ; then
mv .env.tmp .env
......
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