Merge branch 'main' of git.savefamilygps.net:SaveFamily/sf-sim

deployment/develop/docker/docker-compose.yaml

@@ -33,6 +33,18 @@ services:
       - internal
     labels:
       - "io.portainer.accesscontrol.teams=develop"
+      - "traefik.enable=true"
+      - "traefik.http.routers.sf-sims-rabbitmq.entrypoints=web"
+      - "traefik.http.routers.sf-sims-rabbitmq.rule=Host(`sf-sims-rabbitmq.savefamilygps.net`)"
+      - "traefik.http.middlewares.sf-sims-rabbitmq-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.routers.sf-sims-rabbitmq.middlewares=sf-sims-rabbitmq-https-redirect"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.entrypoints=websecure"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.rule=Host(`sf-sims-rabbitmq.savefamilygps.net`)"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.tls=true"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.service=sf-sims-rabbitmq"
+      - "traefik.http.routers.sf-sims-rabbitmq-secure.tls.certresolver=myresolver"
+      - "traefik.http.services.sf-sims-rabbitmq.loadbalancer.server.port=15672"
+      - "traefik.docker.network=proxy"
 
   sf-sims-api:
     container_name: sf-sims-api
@@ -84,23 +96,3 @@ services:
       - "traefik.http.routers.sf-sims-secure.tls.certresolver=myresolver"
       - "traefik.http.services.sf-sims.loadbalancer.server.port=${PORT}"
       - "traefik.docker.network=proxy"
-
-  postgresql-sim:
-    image: postgres:16.1
-    env_file:
-      - ./.env
-    ports:
-      - 5432
-    volumes:
-      - ./postgres:/var/lib/postgres/data
-      - ./database/init.sql:/docker-entrypoint-initdb.d/init.sql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      interval: 5s
-      retries: 5
-      start_period: 5s
-      timeout: 5s
-    networks:
-      - internal
-    labels:
-      - "io.portainer.accesscontrol.teams=develop"