diff --git a/docker-compose.yml b/docker-compose.yml index 99b24f2..bf88f75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,7 @@ version: '3' - services: postgres: - image: postgres:16.0 + image: postgres:16.4 restart: unless-stopped container_name: postgres environment: @@ -11,7 +10,7 @@ services: PGDATA: /data/postgres env_file: sublime.env volumes: - - postgres:/data/postgres + - postgres:/data/postgres ports: - "5432:5432" networks: @@ -25,6 +24,8 @@ services: networks: - net env_file: sublime.env + environment: + MANTIS_HOST_URL: "http://host.docker.internal:8000" redis: image: redis:6.2 restart: unless-stopped @@ -108,11 +109,8 @@ services: - s3_data:/data env_file: sublime.env entrypoint: > - /bin/sh -c " - export MINIO_ROOT_USER=$$AWS_ACCESS_KEY_ID; - export MINIO_ROOT_PASSWORD=$$AWS_SECRET_ACCESS_KEY; - minio server --address 0.0.0.0:8110 --console-address 0.0.0.0:8111 /data; - " + /bin/sh -c " export MINIO_ROOT_USER=$$AWS_ACCESS_KEY_ID; export MINIO_ROOT_PASSWORD=$$AWS_SECRET_ACCESS_KEY; minio server --address 0.0.0.0:8110 --console-address 0.0.0.0:8111 /data; " + create-buckets: image: minio/mc:latest depends_on: @@ -121,27 +119,20 @@ services: - net env_file: sublime.env entrypoint: > - /bin/sh -c " - sleep 15; - /usr/bin/mc config host add myminio http://sublimes3:8110 $$AWS_ACCESS_KEY_ID $$AWS_SECRET_ACCESS_KEY; - /usr/bin/mc mb myminio/email-screenshots; - /usr/bin/mc mb myminio/events; - /usr/bin/mc mb myminio/message-storage; - /usr/bin/mc ls myminio; - exit 0; - " -# alpine-sqs: -# image: softwaremill/elasticmq-native:latest -# container_name: alpine-sqs -# networks: -# - net -# ports: -# - "9324:9324" -# - "9325:9325" # Probably don't expose this IRL -# stdin_open: true -# tty: true -# volumes: -# - ./configs/sqs/custom.conf:/opt/elasticmq.conf + /bin/sh -c " sleep 15; /usr/bin/mc config host add myminio http://sublimes3:8110 $$AWS_ACCESS_KEY_ID $$AWS_SECRET_ACCESS_KEY; /usr/bin/mc mb myminio/email-screenshots; /usr/bin/mc mb myminio/events; /usr/bin/mc mb myminio/message-storage; /usr/bin/mc ls myminio; exit 0; " + + # alpine-sqs: + # image: softwaremill/elasticmq-native:latest + # container_name: alpine-sqs + # networks: + # - net + # ports: + # - "9324:9324" + # - "9325:9325" # Probably don't expose this IRL + # stdin_open: true + # tty: true + # volumes: + # - ./configs/sqs/custom.conf:/opt/elasticmq.conf hydra: image: sublimesec/hydra-cpu:dev restart: unless-stopped @@ -150,11 +141,9 @@ services: container_name: hydra ports: - "8200:8200" - networks: net: driver: bridge - volumes: postgres: logs: