container version updates

Author: Bernd Ritter

Makefile

@@ -1,4 +1,4 @@
-DOCKER_OPTS=--env-file development/db.env --env-file development/oci.env
+DOCKER_OPTS=--env-file development/db.env --env-file development/oci.env --env-file development/queue.env
 
 default: rebuild
 
@@ -16,29 +16,29 @@ clean:
 	$(MAKE) -C app $@
 
 up:
-	docker compose up -d
+	docker compose $(DOCKER_OPTS) up -d
 
 logs:
-	docker compose logs -f
+	docker compose $(DOCKER_OPTS) logs -f
 
 down:
-	docker compose down
+	docker compose $(DOCKER_OPTS) down 
 
 shell:
-	docker compose -f docker-compose.yml exec -it app /bin/bash
+	docker compose $(DOCKER_OPTS) exec -it app /bin/bash
 
 status:
-	docker compose -f docker-compose.yml ps
+	docker compose $(DOCKER_OPTS) ps
 
 setup:
 	mise install
 	yarn install
 
 app-down:
-	docker compose stop app
+	docker compose $(DOCKER_OPTS) stop app
 
 app-up:
-	docker compose up app -d
+	docker compose $(DOCKER_OPTS) up app -d
 
 db-dump:
 	docker compose exec db pg_dump -U holarse holarse > ./backup/holarse-$(shell date +"%Y-%m-%d-%H%M%S%z").sql

app/src/main/resources/application.properties

@@ -14,7 +14,7 @@ logging.level.org.hibernate=warn
 
 spring.jpa.hibernate.ddl-auto=none
 spring.jpa.hibernate.show-sql=true
-spring.datasource.url=jdbc:postgresql://db:5432/${POSTGRES_DB}
+spring.datasource.url=jdbc:postgresql://${POSTGRES_HOST}:5432/${POSTGRES_DB}
 spring.datasource.username=${POSTGRES_USER}
 spring.datasource.password=${POSTGRES_PASSWORD}
 spring.jpa.open-in-view=false
@@ -25,7 +25,7 @@ spring.flyway.locations=classpath:db/migration
 spring.flyway.baseline-on-migrate=true
 
 # queue
-amq.brokerUrl=tcp://queue:61616
+amq.brokerUrl=tcp://${ARTEMIS_HOST}:61616
 amq.username=${ARTEMIS_USER}
 amq.password=${ARTEMIS_PASSWORD}
 

development/db.env

@@ -1,8 +1,5 @@
 # postgres
+POSTGRES_HOST=db
 POSTGRES_USER=holarse
 POSTGRES_PASSWORD=geheim
 POSTGRES_DB=holarse
-
-# apachemq artemis
-ARTEMIS_USER=${POSTGRES_USER}
-ARTEMIS_PASSWORD=${POSTGRES_PASSWORD}

development/queue.env

@@ -0,0 +1,5 @@
+# apachemq artemis
+ARTEMIS_HOST=queue
+ARTEMIS_USER=${POSTGRES_USER}
+ARTEMIS_PASSWORD=${POSTGRES_PASSWORD}
+EXTRA_ARGS=--http-host 0.0.0.0 --relax-jolokia --no-amqp-acceptor --no-hornetq-acceptor --no-mqtt-acceptor --no-stomp-acceptor --queues drueckblick,import,mail,searchidx

docker-compose.yml

@@ -2,7 +2,7 @@
 name: holarse
 services:
   front:
-    image: caddy:2.10
+    image: caddy:2.11-alpine
     restart: no
     ports:
       - "127.0.0.1:80:80"
@@ -13,7 +13,7 @@ services:
       - holarse-front
       - holarse-back
   db:
-    image: postgres:18
+    image: postgres:18.3-trixie
     restart: no
     env_file:
       - development/db.env
@@ -26,12 +26,10 @@ services:
       - holarse-back
 
   queue:
-      image: apache/activemq-artemis:2.44.0
+      image: apache/artemis:2.52.0-alpine
       restart: no
       env_file:
-        - development/db.env
-      environment:
-        - EXTRA_ARGS=--http-host 0.0.0.0 --relax-jolokia --no-amqp-acceptor --no-hornetq-acceptor --no-mqtt-acceptor --no-stomp-acceptor --queues drueckblick,import,mail,searchidx
+        - development/queue.env
       ports:
         - "127.0.0.1:8161:8161"
         - "127.0.0.1:61616:61616"
@@ -46,6 +44,7 @@ services:
     env_file:
       - development/oci.env
       - development/db.env
+      - development/queue.env
     ports:
       - "127.0.0.1:8080:8080"
     volumes:
@@ -62,7 +61,7 @@ services:
       networks:
         - holarse-back
   mail:
-    image: axllent/mailpit
+    image: axllent/mailpit:v1.29
     restart: no
     ports:
       - "127.0.0.1:8025:8025"
@@ -79,4 +78,3 @@ volumes:
 networks:
   holarse-front:
   holarse-back:
-