From 813f1daf210d5c29e0204be889c01936c719bc13 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Fri, 2 Aug 2019 10:48:27 -0300 Subject: [PATCH] WIP --- docker/docker-compose.test.yml | 4 ++-- docker/docker-compose.yml | 11 ++++++----- docker/start.sh | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml index 5d2b8a24e..c5be84fc4 100644 --- a/docker/docker-compose.test.yml +++ b/docker/docker-compose.test.yml @@ -11,7 +11,7 @@ ## mapeados para um diretório no host da máquina. ## ## -version: "3.7" +version: "3.5" services: sapldb: image: postgres:10.5-alpine @@ -88,4 +88,4 @@ volumes: networks: sapl-net: - driver: bridge \ No newline at end of file + driver: bridge diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 884b749a4..ba9772080 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -11,7 +11,7 @@ ## mapeados para um diretório no host da máquina. ## ## -version: "3" +version: "3.5" services: sapldb: image: postgres:10.5-alpine @@ -43,10 +43,11 @@ services: - sapl-net sapl: - image: interlegis/sapl:3.1.160-RC0 -# build: -# context: ../ -# dockerfile: ./docker/Dockerfile + #image: interlegis/sapl:3.1.159 + build: + context: ../ + dockerfile: ./docker/Dockerfile + target: sapl container_name: sapl labels: NAME: "sapl" diff --git a/docker/start.sh b/docker/start.sh index bea1eb959..ce259497c 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -46,7 +46,7 @@ create_env() { create_env -/bin/bash busy-wait.sh $DATABASE_URL +/bin/bash wait-for-it.sh yes yes | python3 manage.py migrate