OY-4695 update Flyway to latest, PostgreSQL to 15 in dev env

Opetushallitus · Feb 21, 2024 · 6ed83e4 · 6ed83e4
1 parent c35ea75
commit 6ed83e4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 42 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,41 +1,41 @@
-version: '3.7'
-services:
-  maksut-nginx-local:
-    image: nginx
-    container_name: maksut-nginx-local
-    networks:
-      maksut-local-network:
-    ports:
-      - "9030:9030"
-      - "19030:19030"
-    volumes:
-      - "./nginx:/etc/nginx"
-  maksut-e2e-db-local:
-    image: postgres:12-alpine
-    container_name: maksut-e2e-db-local
-    environment:
-      POSTGRES_PASSWORD: postgres_password
-      POSTGRES_USER: postgres_user
-      POSTGRES_DB: maksut
-    networks:
-      maksut-local-e2e-network:
-    ports:
-      - "15432:15432"
-    command: -p 15432
-  maksut-db-local:
-    image: postgres:12-alpine
-    container_name: maksut-db-local
-    environment:
-      POSTGRES_PASSWORD: postgres_password
-      POSTGRES_USER: postgres_user
-      POSTGRES_DB: maksut
-      TZ: 'Europe/Helsinki'
-      PGTZ: 'Europe/Helsinki'
-    networks:
-      maksut-local-network:
-    ports:
-      - "15499:5432"
-    #command: -p 55499
-networks:
-  maksut-local-network:
-  maksut-local-e2e-network:
+version: '3.7'
+services:
+  maksut-nginx-local:
+    image: nginx
+    container_name: maksut-nginx-local
+    networks:
+      maksut-local-network:
+    ports:
+      - "9030:9030"
+      - "19030:19030"
+    volumes:
+      - "./nginx:/etc/nginx"
+  maksut-e2e-db-local:
+    image: postgres:15-alpine
+    container_name: maksut-e2e-db-local
+    environment:
+      POSTGRES_PASSWORD: postgres_password
+      POSTGRES_USER: postgres_user
+      POSTGRES_DB: maksut
+    networks:
+      maksut-local-e2e-network:
+    ports:
+      - "15432:15432"
+    command: -p 15432
+  maksut-db-local:
+    image: postgres:15-alpine
+    container_name: maksut-db-local
+    environment:
+      POSTGRES_PASSWORD: postgres_password
+      POSTGRES_USER: postgres_user
+      POSTGRES_DB: maksut
+      TZ: 'Europe/Helsinki'
+      PGTZ: 'Europe/Helsinki'
+    networks:
+      maksut-local-network:
+    ports:
+      - "15499:5432"
+    #command: -p 55499
+networks:
+  maksut-local-network:
+  maksut-local-e2e-network:
diff --git a/project.clj b/project.clj
@@ -16,7 +16,8 @@
                  [timbre-ns-pattern-level "0.1.2"]
                  [com.stuartsierra/component "1.1.0"]
                  [clj-soup/clojure-soup "0.1.3"]
-                 [org.flywaydb/flyway-core "7.0.2"]
+                 [org.flywaydb/flyway-core "10.8.1"]
+                 [org.flywaydb/flyway-database-postgresql "10.8.1"]
                  [fi.vm.sade/auditlogger "9.0.0-SNAPSHOT"]
                  [fi.vm.sade.java-utils/java-cas "0.6.2-SNAPSHOT"]
                  [fi.vm.sade.java-utils/java-properties "0.1.0-SNAPSHOT"]