diff --git a/.nais/test/klass-forvaltning.yaml b/.nais/test/klass-forvaltning.yaml index 9e776144..6ef8fce3 100644 --- a/.nais/test/klass-forvaltning.yaml +++ b/.nais/test/klass-forvaltning.yaml @@ -38,6 +38,10 @@ spec: value: klass-forvaltning.intern.test.ssb.no - name: KLASS_SECURITY_OAUTH2_LOGOUT_PATH value: /oauth2/logout + - name: SPRING_DATA_SOLR_HOST + value: http://klass-solr/solr/ + - name: KLASS_ENV_SEARCH_SOLR_URL + value: http://klass-solr/solr/ envFrom: - secret: google-sql-klass - secret: klass-forvaltning-application-properties diff --git a/klass-forvaltning/pom.xml b/klass-forvaltning/pom.xml index 538423fd..930061ae 100644 --- a/klass-forvaltning/pom.xml +++ b/klass-forvaltning/pom.xml @@ -17,7 +17,7 @@ statisticsnorway/klass - 2.2.3 + 2.2.5 2.1.7 diff --git a/klass-forvaltning/src/main/resources/application-remote-solr.properties b/klass-forvaltning/src/main/resources/application-remote-solr.properties index 2eb60c00..915a408f 100644 --- a/klass-forvaltning/src/main/resources/application-remote-solr.properties +++ b/klass-forvaltning/src/main/resources/application-remote-solr.properties @@ -1,4 +1,4 @@ -klass.env.search.solr.url=http://klass-solr/solr/Klass +klass.env.search.solr.url=http://klass-solr/solr klass.env.search.solr.core=Klass diff --git a/klass-forvaltning/src/main/resources/logback-spring.xml b/klass-forvaltning/src/main/resources/logback-spring.xml index c9b49147..7f36795e 100644 --- a/klass-forvaltning/src/main/resources/logback-spring.xml +++ b/klass-forvaltning/src/main/resources/logback-spring.xml @@ -15,18 +15,6 @@ - - - - {"@timestamp":"%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}","httpRequest":%message,"logger":"%logger","severity":"%level","thread":"%thread"}%n - - - - - - - - @@ -35,4 +23,4 @@ - + \ No newline at end of file diff --git a/klass-shared/docker-compose.yaml b/klass-shared/docker-compose.yaml index da70a960..cbe29901 100644 --- a/klass-shared/docker-compose.yaml +++ b/klass-shared/docker-compose.yaml @@ -75,7 +75,7 @@ services: - solr - postgresql ports: - - "8083:8080" + - "8080:8080" mem_limit: 8g deploy: resources: @@ -83,11 +83,13 @@ services: cpus: "1.0" memory: 8G environment: - SPRING_PROFILES_ACTIVE: "api,postgres-local,small-import" + SPRING_PROFILES_ACTIVE: "api,small-import,postgres-local" SPRING_DATA_SOLR_HOST: http://solr:8983/solr POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: "klass" POSTGRES_INSTANCE: postgresql + KLASS_ENV_SEARCH_SOLR_URL: http://solr:8983/solr/ + KLASS_ENV_SEARCH_SOLR_CORE: Klass klass-forvaltning: build: context: ../klass-forvaltning @@ -108,6 +110,29 @@ services: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_USER: klass POSTGRES_INSTANCE: postgresql + klass-forvaltning-search: + build: + context: ../klass-forvaltning + dockerfile: ../klass-forvaltning/Dockerfile + container_name: klass-forvaltning + profiles: [ search ] + ports: + - "8081:8081" + depends_on: + - postgresql + command: [ "java", "-XshowSettings:vm", "-Xms512m", "-Xmx2g", "-jar", "app.war" ] + deploy: + resources: + limits: + memory: 3G + environment: + SPRING_PROFILES_ACTIVE: frontend, hardcoded-user, postgres-local, ad-offline, small-import, remote-solr, skip-indexing + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_USER: klass + POSTGRES_INSTANCE: postgresql + SPRING_DATA_SOLR_HOST: http://solr:8983/solr/ + KLASS_ENV_SEARCH_SOLR_URL: http://solr:8983/solr/ + KLASS_ENV_SEARCH_SOLR_CORE: Klass solr: image: klass-shared-solr:5.5.2 container_name: solr