Working solr for forvaltning

.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

klass-forvaltning/pom.xml

@@ -17,7 +17,7 @@
         <github.repository>statisticsnorway/klass</github.repository>
         <!-- Klass dependencies are built with support for Java 8 and Spring Boot 1.4.4.
              Newer versions are not supported -->
-        <klass-shared-version>2.2.3</klass-shared-version>
+        <klass-shared-version>2.2.5</klass-shared-version>
         <klass-solr-version>2.1.7</klass-solr-version>
         <!-- Vaadin 7.7.17 was the last public open-source version of the Vaadin 7 framework.
              See https://vaadin.com/support/vaadin-7-extended-maintenance  -->

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
 
 

klass-forvaltning/src/main/resources/logback-spring.xml

@@ -15,18 +15,6 @@
         </encoder>
     </appender>
 
-    <appender name="HTTP_ACCESS_LOGGER_STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>
-                {"@timestamp":"%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}","httpRequest":%message,"logger":"%logger","severity":"%level","thread":"%thread"}%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <logger name="HTTP_ACCESS_LOGGER" level="info" additivity="false">
-        <appender-ref ref="HTTP_ACCESS_LOGGER_STDOUT"/>
-    </logger>
-
     <logger name="org.springframework.boot.actuate.endpoint.mvc.HealthMvcEndpoint" level="DEBUG">
         <appender-ref ref="STDOUT"/>
     </logger>
@@ -35,4 +23,4 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-</configuration>
+</configuration>

klass-shared/docker-compose.yaml

@@ -75,19 +75,21 @@ services:
       - solr
       - postgresql
     ports:
-      - "8083:8080"
+      - "8080:8080"
     mem_limit: 8g
     deploy:
       resources:
         limits:
           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