Bugfix, Makefile and docker-compose improvements (#364)

* Update klass-shared version used by klass-forvaltning

* Some Makefile and docker-compose improvements

Author: JanhSander

Makefile

@@ -106,11 +106,7 @@ logs-klass-forvaltning:
 
 .PHONY: stop-klass-forvaltning-docker
 stop-klass-forvaltning-docker:
-	docker compose $(COMPOSE_FILE) --profile frontend down
-
-.PHONY: rebuild-klass-forvaltning-docker
-rebuild-klass-forvaltning-docker:
-	docker compose $(COMPOSE_FILE) --profile frontend build --no-cache klass-forvaltning
+	docker compose $(COMPOSE_FILE) --profile frontend down -v
 
 .PHONY: clean-klass-forvaltning-volumes
 clean-klass-forvaltning-volumes:
@@ -139,13 +135,13 @@ logs-klass-api:
 
 .PHONY: stop-klass-api-docker
 stop-klass-api-docker:
-	docker compose $(COMPOSE_FILE) --profile api down
+	docker compose $(COMPOSE_FILE) --profile api down -v
 
 .PHONY: start-klass-api-search-docker
 start-klass-api-search-docker:
 	docker compose $(COMPOSE_FILE) --profile api-search up --build -d
 
 .PHONY: stop-klass-api-search-docker
 stop-klass-api-search-docker:
-	docker compose $(COMPOSE_FILE) --profile api-search down
+	docker compose $(COMPOSE_FILE) --profile api-search down -v
 

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.8</klass-shared-version>
+        <klass-shared-version>2.2.9</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-shared/docker-compose.yaml

@@ -21,7 +21,12 @@ services:
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: "klass"
-      POSTGRES_DATABASE: "klass"
+      POSTGRES_DB: "klass"
+    healthcheck:
+        test: [ "CMD-SHELL", "pg_isready -U klass -d klass" ]
+        interval: 10s
+        timeout: 5s
+        retries: 5
   klass-api:
     build:
       context: ../klass-api
@@ -86,17 +91,18 @@ services:
     ports:
       - "8081:8081"
     depends_on:
-      - postgresql
-    command: [ "java", "-XshowSettings:vm", "-Xms512m", "-Xmx2g", "-jar", "app.war" ]
+      postgresql:
+        condition: service_healthy
     deploy:
       resources:
         limits:
           memory: 3G
     environment:
       SPRING_PROFILES_ACTIVE: frontend, hardcoded-user, postgres-local, ad-offline, small-import, skip-indexing, embedded-solr
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_USER: klass
-      POSTGRES_INSTANCE: postgresql
+      SPRING_DATASOURCE_URL: jdbc:postgresql://postgresql:5432/klass
+      SPRING_DATASOURCE_USERNAME: klass
+      SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD}
+      KLASS_ENV_CLIENT_KLASS_MAIL_URL: "http://klass-mail:8080"
   klass-forvaltning-search:
     build:
       context: ../klass-forvaltning