Free 23 (#1188)

* Free 23 * Ora 23.5
navikt · Aug 12, 2024 · c3510c7 · c3510c7
1 parent 356b3b8
commit c3510c7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.oracle/docker-compose.yml b/.oracle/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   oracle:
-    image: gvenzl/oracle-xe:21.3.0-slim-faststart
+    image: gvenzl/oracle-free:23.5-slim-faststart
     environment:
       - ORACLE_RANDOM_PASSWORD=true
     shm_size: 2gb

diff --git a/.oracle/oracle-init/fpabonnent.sql b/.oracle/oracle-init/fpabonnent.sql
@@ -1,4 +1,4 @@
-ALTER SESSION SET CONTAINER=XE;
+ALTER SESSION SET CONTAINER=FREEPDB1;
 
 -- CREATE USER FPABONNENT
 CREATE USER FPABONNENT

diff --git a/...r/src/test/java/no/nav/foreldrepenger/abonnent/dbstøtte/Databaseskjemainitialisering.java b/...r/src/test/java/no/nav/foreldrepenger/abonnent/dbstøtte/Databaseskjemainitialisering.java
@@ -91,6 +91,6 @@ private static HikariDataSource createDs() {
 
     private static String buildJdbcUrl() {
         return String.format("jdbc:oracle:thin:@//%s:%s/%s", ENV.getProperty("database.host", "localhost"), ENV.getProperty("database.post", "1521"),
-            ENV.getProperty("database.service", "XE"));
+            ENV.getProperty("database.service", "FREEPDB1"));
     }
 }
diff --git a/migreringer/src/test/java/no/nav/foreldrepenger/db/validering/SjekkDbStrukturTest.java b/migreringer/src/test/java/no/nav/foreldrepenger/db/validering/SjekkDbStrukturTest.java
@@ -212,6 +212,7 @@ void skal_ha_korrekt_index_navn() throws Exception {
              and index_name not like 'PK_%' and index_name not like 'IDX_%' and index_name not like 'UIDX_%'
              and table_name not like 'schema_%'
              and table_name not like 'HTE_%'
+             and table_name not like 'BIN$%'
             """;
 
         List<String> avvik = new ArrayList<>();

diff --git a/web/src/test/resources/application-vtp.properties b/web/src/test/resources/application-vtp.properties
@@ -14,7 +14,7 @@ azure.app.well.known.url=http://authserver:8086/azureAd/.well-known/openid-confi
 azure.app.client.id=vtp
 azure.app.client.secret=vtp
 
-defaultDS.url=jdbc:oracle:thin:@//localhost:1521/XE
+defaultDS.url=jdbc:oracle:thin:@//localhost:1521/FREEPDB1
 defaultDS.username=fpabonnent
 defaultDS.password=fpabonnent