Simplify docker compose

Author: mmwinther

Makefile

@@ -121,18 +121,10 @@ logs-klass-api:
 stop-klass-api-docker:
 	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 -v
-
 .PHONY: start-klass-api-open-search-docker
 start-klass-api-open-search-docker:
-	docker compose $(COMPOSE_FILE) --profile api-open-search up --build -d
+	docker compose $(COMPOSE_FILE) --profile open-search up --build -d
 
 .PHONY: stop-klass-api-open-search-docker
 stop-klass-api-open-search-docker:
-	docker compose $(COMPOSE_FILE) --profile api-open-search down -v
+	docker compose $(COMPOSE_FILE) --profile open-search down -v

klass-shared/docker-compose.yaml

@@ -3,14 +3,10 @@ services:
     image: postgres:17.4
     profiles:
       [
-        migration-testing,
-        migrate-data,
         frontend,
         api,
-        search,
-        api-search,
+        solr-search,
         open-search,
-        api-open-search,
       ]
     ports:
       - "5432:5432"
@@ -31,7 +27,7 @@ services:
       context: ../klass-api
       dockerfile: ../klass-api/Dockerfile
     command: [ "java", "-Xms1g", "-jar", "app.war" ]
-    profiles: [ migration-testing, api ]
+    profiles: [ api ]
     depends_on:
       - postgresql
     ports:
@@ -43,33 +39,12 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: "klass"
       POSTGRES_INSTANCE: postgresql
-  klass-api-search:
-    build:
-      context: ../klass-api
-      dockerfile: ../klass-api/Dockerfile
-    command: [ "java", "-Xms2g", "-Xmx4g", "-jar", "app.war" ]
-    profiles: [ search, api-search ]
-    depends_on:
-      - solr
-      - postgresql
-    ports:
-      - "8080:8080"
-    mem_limit: 8g
-    cpus: 1.0
-    environment:
-      SPRING_PROFILES_ACTIVE: "api, 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-api-open-search:
     build:
       context: ../klass-api
       dockerfile: ../klass-api/Dockerfile
     command: [ "java", "-Xms2g", "-Xmx4g", "-jar", "app.war" ]
-    profiles: [ open-search, api-open-search ]
+    profiles: [ open-search ]
     depends_on:
       - opensearch
       - postgresql
@@ -107,7 +82,7 @@ services:
     build:
       context: ../klass-forvaltning
       dockerfile: ../klass-forvaltning/Dockerfile
-    profiles: [ search ]
+    profiles: [ solr-search ]
     ports:
       - "8081:8081"
     depends_on:
@@ -131,15 +106,14 @@ services:
       context: ../klass-solr
       dockerfile: ../klass-solr/Dockerfile
     platform: linux/amd64
-    profiles: [ search, api-search ]
+    profiles: [ solr-search ]
     ports:
       - "8983:8983"
     volumes:
       - solr_data:/var/solr
     mem_limit: 4g
   opensearch:
     image: opensearchproject/opensearch:3.0.0
-    container_name: klass-shared-opensearch-1
     ports:
       - "9200:9200"
     environment:
@@ -152,7 +126,7 @@ services:
         soft: -1
         hard: -1
     mem_limit: 2g
-    profiles: [ open-search, api-open-search ]
+    profiles: [ open-search ]
     volumes:
       - opensearch_data:/usr/share/opensearch/data
 volumes: