fix: make liquibase diff (#548)

Decathlon · Nov 24, 2021 · 8f96085 · 8f96085
1 parent 19e7934
commit 8f96085
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/code/api/migration-h2.yaml b/code/api/migration-h2.yaml
@@ -15,6 +15,15 @@ services:
       - api_net
     volumes:
       - ./db_h2:/app/data
+    depends_on:
+      - oauth2-dev-server
+  oauth2-dev-server:
+    image: "decathlon/ara-oads:${OADS_VERSION:-latest}"
+    restart: unless-stopped
+    networks:
+      api_net:
+        aliases:
+          - oauth2.dev.localhost
   ara-h2-mig-api:
     image: docker.io/decathlon/ara-api
     restart: always
@@ -28,16 +37,18 @@ services:
       - api_net
     volumes:
       - ./db_h2_mig:/app/data
+    depends_on:
+      - oauth2-dev-server
   waiter-h2-api:
     image: aligor/wait-for-url
-    command: ["--url", "http://ara-h2-api:8000/actuator/info", "--retries", "20", "--delay", "3000"]
+    command: ["--url", "http://ara-h2-api:8001/actuator/info", "--retries", "20", "--delay", "3000"]
     networks:
       - api_net
     depends_on:
       - ara-h2-api
   waiter-h2-mig-api:
     image: aligor/wait-for-url
-    command: ["--url", "http://ara-h2-mig-api:8000/actuator/info", "--retries", "20", "--delay", "3000"]
+    command: ["--url", "http://ara-h2-mig-api:8001/actuator/info", "--retries", "20", "--delay", "3000"]
     networks:
       - api_net
     depends_on:

diff --git a/code/api/migration-mysql.yaml b/code/api/migration-mysql.yaml
@@ -28,6 +28,13 @@ services:
       - MYSQL_ROOT_PASSWORD=to_change
     networks:
       - db_net
+  oauth2-dev-server:
+    image: "decathlon/ara-oads:${OADS_VERSION:-latest}"
+    restart: unless-stopped
+    networks:
+      api_net:
+        aliases:
+          - oauth2.dev.localhost
   ara-mysql-api:
     image: docker.io/decathlon/ara-api
     restart: always
@@ -42,6 +49,7 @@ services:
       - api_net
     depends_on:
       - ara-mysql-db-source
+      - oauth2-dev-server
   ara-mysql-mig-api:
     image: docker.io/decathlon/ara-api
     restart: always
@@ -58,16 +66,17 @@ services:
       - api_net
     depends_on:
       - ara-mysql-db-target
+      - oauth2-dev-server
   waiter-mysql-api:
     image: aligor/wait-for-url
-    command: ["--url", "http://ara-mysql-api:8000/actuator/info", "--retries", "20", "--delay", "3000"]
+    command: ["--url", "http://ara-mysql-api:8001/actuator/info", "--retries", "20", "--delay", "3000"]
     networks:
       - api_net
     depends_on:
       - ara-mysql-api
   waiter-mysql-mig-api:
     image: aligor/wait-for-url
-    command: ["--url", "http://ara-mysql-mig-api:8000/actuator/info", "--retries", "20", "--delay", "3000"]
+    command: ["--url", "http://ara-mysql-mig-api:8001/actuator/info", "--retries", "20", "--delay", "3000"]
     networks:
       - api_net
     depends_on:

diff --git a/code/api/migration-postgresql.yaml b/code/api/migration-postgresql.yaml
@@ -26,6 +26,13 @@ services:
       - POSTGRES_PASSWORD=changeme
     networks:
       - db_net
+  oauth2-dev-server:
+    image: "decathlon/ara-oads:${OADS_VERSION:-latest}"
+    restart: unless-stopped
+    networks:
+      api_net:
+        aliases:
+          - oauth2.dev.localhost
   ara-postgresql-api:
     image: docker.io/decathlon/ara-api
     restart: always
@@ -40,6 +47,7 @@ services:
       - api_net
     depends_on:
       - ara-postgresql-db-source
+      - oauth2-dev-server
   ara-postgresql-mig-api:
     image: docker.io/decathlon/ara-api
     restart: always
@@ -56,16 +64,17 @@ services:
       - api_net
     depends_on:
       - ara-postgresql-db-target
+      - oauth2-dev-server
   waiter-postgresql-api:
     image: aligor/wait-for-url
-    command: ["--url", "http://ara-postgresql-api:8000/actuator/info", "--retries", "20", "--delay", "3000"]
+    command: ["--url", "http://ara-postgresql-api:8001/actuator/info", "--retries", "20", "--delay", "3000"]
     networks:
       - api_net
     depends_on:
       - ara-postgresql-api
   waiter-postgresql-mig-api:
     image: aligor/wait-for-url
-    command: ["--url", "http://ara-postgresql-mig-api:8000/actuator/info", "--retries", "20", "--delay", "3000"]
+    command: ["--url", "http://ara-postgresql-mig-api:8001/actuator/info", "--retries", "20", "--delay", "3000"]
     networks:
       - api_net
     depends_on: