Skip to content

Commit

Permalink
docker: update docker-compose to v3
Browse files Browse the repository at this point in the history
Update docker-compose to v3. Closes #1321.

Signed-off-by: David López <not4rent@gmail.com>
  • Loading branch information
lopezator authored and aeneasr committed Apr 1, 2019
1 parent 468076e commit d5993cb
Showing 2 changed files with 4 additions and 26 deletions.
14 changes: 1 addition & 13 deletions docker-compose-twoc.yml
Original file line number Diff line number Diff line change
@@ -10,16 +10,14 @@
# #
###########################################################################

version: '2'
version: '3'

services:

hydra-migrate:
build:
context: .
dockerfile: Dockerfile
links:
- postgresd:postgresd
environment:
# - LOG_LEVEL=debug
- DATABASE_URL=postgres://hydra:secret@postgresd:5432/hydra?sslmode=disable
@@ -31,10 +29,6 @@ services:
build:
context: .
dockerfile: Dockerfile
links:
- postgresd:postgresd
# Uncomment the following line to use mysql instead.
# - mysqld:mysqld
depends_on:
- hydra-migrate
ports:
@@ -58,10 +52,6 @@ services:
build:
context: .
dockerfile: Dockerfile
links:
- postgresd:postgresd
# Uncomment the following line to use mysql instead.
# - mysqld:mysqld
depends_on:
- hydra-migrate
ports:
@@ -85,8 +75,6 @@ services:
environment:
- HYDRA_ADMIN_URL=http://hydra-admin:4445
image: oryd/hydra-login-consent-node:v1.0.0-rc.5
links:
- hydra-admin
ports:
- "3000:3000"
restart: unless-stopped
16 changes: 3 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -10,18 +10,14 @@
# #
###########################################################################

version: '2'
version: '3'

services:

hydra-migrate:
build:
context: .
dockerfile: Dockerfile
links:
- postgresd:postgresd
# Uncomment the following section to use mysql instead.
# - mysqld:mysqld
environment:
# - LOG_LEVEL=debug
- DATABASE_URL=postgres://hydra:secret@postgresd:5432/hydra?sslmode=disable
@@ -35,10 +31,6 @@ services:
build:
context: .
dockerfile: Dockerfile
links:
- postgresd:postgresd
# Uncomment the following line to use mysql instead.
# - mysqld:mysqld
depends_on:
- hydra-migrate
# Uncomment the following when configuring tracing
@@ -71,17 +63,15 @@ services:
# - TRACING_PROVIDER_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
# - TRACING_PROVIDER_JAEGER_SAMPLING_TYPE=const
# - TRACING_PROVIDER_JAEGER_SAMPLING_VALUE=1
restart: on-failure
restart: unless-stopped

consent:
environment:
- HYDRA_ADMIN_URL=http://hydra:4445
image: oryd/hydra-login-consent-node:v1.0.0-rc.5
links:
- hydra
ports:
- "3000:3000"
restart: on-failure
restart: unless-stopped

# Uncomment the following when configuring tracing

0 comments on commit d5993cb

Please sign in to comment.