From afd679fae64ef15f14f57d688664340533c10e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=ADrius=20Roberto=20da=20Costa=20Gomes?= Date: Fri, 31 Aug 2018 17:00:03 -0300 Subject: [PATCH 1/4] Adding initialization, build and test scripts. Modifying mysql host name on hibernate.cfg.xml. Adding healthcheck param on docker-compose. --- backend/src/main/resources/hibernate.cfg.xml | 2 +- backend/test.ps1 | 2 +- build.ps1 | 15 +++++++++++++++ docker/docker-compose.yml | 5 +++++ run.ps1 | 2 ++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 build.ps1 create mode 100644 run.ps1 diff --git a/backend/src/main/resources/hibernate.cfg.xml b/backend/src/main/resources/hibernate.cfg.xml index 5c9e1d3..cf39268 100644 --- a/backend/src/main/resources/hibernate.cfg.xml +++ b/backend/src/main/resources/hibernate.cfg.xml @@ -5,7 +5,7 @@ com.mysql.jdbc.Driver - jdbc:mysql://db:3306/dojo + jdbc:mysql://mysql:3306/dojo root k2j32ks4 10 diff --git a/backend/test.ps1 b/backend/test.ps1 index d9747f5..7f0e31d 100644 --- a/backend/test.ps1 +++ b/backend/test.ps1 @@ -5,7 +5,7 @@ docker rm $(docker ps -aq) echo "Removing all docker volumes" docker volume rm $(docker volume ls -q) echo "Booting docker-compose test file" -docker-compose --file ..\docker\docker-compose.yml up -d +docker-compose --file .\src\test\resources\docker-compose.yml up -d sleep 10 echo "Starting build and tests" mvn clean test diff --git a/build.ps1 b/build.ps1 new file mode 100644 index 0000000..107bfe3 --- /dev/null +++ b/build.ps1 @@ -0,0 +1,15 @@ +echo "Stopping all running docker containers" +docker stop $(docker ps -aq) +echo "Removing all docker containers" +docker rm $(docker ps -aq) +echo "Removing all docker volumes" +docker volume rm $(docker volume ls -q) +cd backend +echo "Booting docker-compose test file" +docker-compose --file .\src\test\resources\docker-compose.yml up -d +sleep 10 +echo "Starting build and tests" +mvn package +echo "Stopping all running docker containers" +docker stop $(docker ps -aq) +cd .. diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 23b5270..430e85a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -25,6 +25,11 @@ services: build: ../backend/ ports: - 8090:8080 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080/"] + interval: 1s + timeout: 3s + retries: 60 depends_on: - mysql networks: diff --git a/run.ps1 b/run.ps1 new file mode 100644 index 0000000..4d00749 --- /dev/null +++ b/run.ps1 @@ -0,0 +1,2 @@ +echo "Booting docker-compose production file" +docker-compose --file .\docker\docker-compose.yml up --build \ No newline at end of file From 0f7e1b21add60b29ab7890f7fb8ca3dab3e4e77f Mon Sep 17 00:00:00 2001 From: Helton Carlos de Souza Date: Sat, 1 Sep 2018 12:00:17 -0300 Subject: [PATCH 2/4] Alterado healthcheck para o servico do mysql --- docker/docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 430e85a..ce6b41b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,14 +1,18 @@ -version: "3.1" +version: "2.1" services: - mysql: + db: image: mysql:5.7 environment: - MYSQL_ROOT_PASSWORD: k2j32ks4 + MYSQL_ROOT_PASSWORD: k2j32ks4 ports: - 3306:3306 volumes: - ../db:/docker-entrypoint-initdb.d + healthcheck: + test: mysql --user=root --password=k2j32ks4 -e 'SHOW DATABASES' + timeout: 20s + retries: 10 networks: - greatquotes @@ -17,7 +21,7 @@ services: ports: - 8085:8080 depends_on: - - mysql + - db networks: - greatquotes @@ -25,13 +29,9 @@ services: build: ../backend/ ports: - 8090:8080 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] - interval: 1s - timeout: 3s - retries: 60 depends_on: - - mysql + db: + condition: service_healthy networks: - greatquotes From 34e79ff6af275655414ff96eed9641ba59773fbb Mon Sep 17 00:00:00 2001 From: Helton Carlos de Souza Date: Sat, 1 Sep 2018 12:06:03 -0300 Subject: [PATCH 3/4] Corrigido config com o db --- backend/src/main/resources/hibernate.cfg.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/hibernate.cfg.xml b/backend/src/main/resources/hibernate.cfg.xml index cf39268..5c9e1d3 100644 --- a/backend/src/main/resources/hibernate.cfg.xml +++ b/backend/src/main/resources/hibernate.cfg.xml @@ -5,7 +5,7 @@ com.mysql.jdbc.Driver - jdbc:mysql://mysql:3306/dojo + jdbc:mysql://db:3306/dojo root k2j32ks4 10 From 9a4acc4edf8c67d141ec7576ebe00714b9ae6937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Si=CC=81rius=20Gomes?= Date: Sun, 2 Sep 2018 18:00:15 -0300 Subject: [PATCH 4/4] =?UTF-8?q?Alterando=20localiza=C3=A7=C3=A3o=20dos=20s?= =?UTF-8?q?cripts=20de=20inicializa=C3=A7=C3=A3o=20e=20build.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.ps1 => scripts/build.ps1 | 6 +++--- backend/test.ps1 => scripts/build.sh | 10 +++++++--- run.ps1 => scripts/run.ps1 | 0 scripts/run.sh | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) rename build.ps1 => scripts/build.ps1 (79%) rename backend/test.ps1 => scripts/build.sh (69%) mode change 100644 => 100755 rename run.ps1 => scripts/run.ps1 (100%) create mode 100755 scripts/run.sh diff --git a/build.ps1 b/scripts/build.ps1 similarity index 79% rename from build.ps1 rename to scripts/build.ps1 index 107bfe3..90cf173 100644 --- a/build.ps1 +++ b/scripts/build.ps1 @@ -4,12 +4,12 @@ echo "Removing all docker containers" docker rm $(docker ps -aq) echo "Removing all docker volumes" docker volume rm $(docker volume ls -q) -cd backend +cd ..\backend echo "Booting docker-compose test file" -docker-compose --file .\src\test\resources\docker-compose.yml up -d +docker-compose --file ..\src\test\resources\docker-compose.yml up -d sleep 10 echo "Starting build and tests" mvn package echo "Stopping all running docker containers" docker stop $(docker ps -aq) -cd .. +cd ..\scripts diff --git a/backend/test.ps1 b/scripts/build.sh old mode 100644 new mode 100755 similarity index 69% rename from backend/test.ps1 rename to scripts/build.sh index 7f0e31d..89ce0dd --- a/backend/test.ps1 +++ b/scripts/build.sh @@ -1,13 +1,17 @@ +#!/bin/bash echo "Stopping all running docker containers" docker stop $(docker ps -aq) echo "Removing all docker containers" docker rm $(docker ps -aq) echo "Removing all docker volumes" docker volume rm $(docker volume ls -q) +cd ../backend echo "Booting docker-compose test file" -docker-compose --file .\src\test\resources\docker-compose.yml up -d +docker-compose --file src/test/resources/docker-compose.yml up -d sleep 10 echo "Starting build and tests" -mvn clean test +mvn package echo "Stopping all running docker containers" -docker stop $(docker ps -aq) \ No newline at end of file +docker stop $(docker ps -aq) +cd ../scripts + diff --git a/run.ps1 b/scripts/run.ps1 similarity index 100% rename from run.ps1 rename to scripts/run.ps1 diff --git a/scripts/run.sh b/scripts/run.sh new file mode 100755 index 0000000..cfcf5ff --- /dev/null +++ b/scripts/run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +echo "Booting docker-compose production file" +docker-compose --file ../docker/docker-compose.yml up --build