Commit e6d4eea8 authored by Nils Mittler's avatar Nils Mittler 🕵🏼
Browse files

Merge branch '1-use-container-images-from-git-registry-thm-de' into 'master'

Resolve "Use container images from git-registry.thm.de"

Closes #1

See merge request !6
parents 6ae985e3 dc03fa61
version: "3"
version: '3'
services:
postgresql_fragjetzt:
ports:
- 127.0.0.1:5432:5432
rabbitmq:
ports:
- 127.0.0.1:5672:5672
- 127.0.0.1:15672:15672
- 127.0.0.1:61613:61613
frag-jetzt-backend:
image: arsnova/fragjetzt-backend:staging
image: git-registry.thm.de/arsnova/frag.jetzt-backend:staging
ports:
- 127.0.0.1:8888:8888
arsnova-ws-gateway:
ports:
- 127.0.0.1:8080:8080
version: "3"
version: '3'
services:
postgresql_fragjetzt:
restart: unless-stopped
rabbitmq:
restart: unless-stopped
frag-jetzt-backend:
restart: unless-stopped
arsnova-ws-gateway:
restart: unless-stopped
version: "3"
version: '3'
services:
postgresql_fragjetzt:
image: postgres:12.1
......@@ -8,6 +9,7 @@ services:
POSTGRES_PASSWORD: fragjetzt
volumes:
- postgresql_fragjetzt_data:/var/lib/postgresql/data
rabbitmq:
build:
context: ./rabbitmq
......@@ -15,8 +17,9 @@ services:
environment:
RABBITMQ_DEFAULT_USER: guest
RABBITMQ_DEFAULT_PASS: guest
frag-jetzt-backend:
image: arsnova/fragjetzt-backend:master
image: git-registry.thm.de/arsnova/frag.jetzt-backend:master
depends_on:
- rabbitmq
- postgresql_fragjetzt
......@@ -26,10 +29,11 @@ services:
SPRING_R2DBC_URL: r2dbc:postgresql://postgresql_fragjetzt/fragjetzt
SPRING_R2DBC_HOST: postgresql_fragjetzt
SPRING_R2DBC_PORT: 5432
APP_MAIL_HOST: "172.17.0.1"
APP_MAIL_SENDER_ADDRESS: ""
APP_MAIL_HOST: '172.17.0.1'
APP_MAIL_SENDER_ADDRESS: ''
arsnova-ws-gateway:
image: registry.gitlab.com/particify/dev/foss/arsnova-ws-gateway:frag-jetzt
image: git-registry.thm.de/arsnova/arsnova-ws-gateway:frag-jetzt
depends_on:
- rabbitmq
environment:
......@@ -39,5 +43,6 @@ services:
STOMP_RELAY_PASSWORD: guest
SECURITY_JWT_SECRET: secret
command: /jetty/start.jar --module=http-forwarded
volumes:
postgresql_fragjetzt_data:
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment