Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Complete env configure #175

Merged
merged 3 commits into from
Mar 7, 2025
Merged

ci: Complete env configure #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5ea4de
Add opt to gitignore (keycloak output)
Holzchopf Mar 6, 2025
4b7902d
Add configurability for redis and keycloak ports
Holzchopf Mar 6, 2025
6e96ccf
Merge branch 'main' into complete-env-configure
Holzchopf Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ lib64/
parts/
sdist/
var/
opt/
wheels/
*.egg-info/
.installed.cfg
Expand Down
4 changes: 2 additions & 2 deletions evaluation/docker-compose-demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
redis:
image: redis
ports:
- 6379:6379
- ${REDIS_PORT:-6379}:6379
restart: unless-stopped
logging:
options:
Expand Down Expand Up @@ -124,7 +124,7 @@ services:
- ./compute_worker/tasks_docker_compose.py:/app/tasks.py
env_file: .env
environment:
- BROKER_URL=pyamqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOST}:${RABBITMQ_PORT}//
- BROKER_URL=pyamqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOST}:5672//
- REDIS_IP=redis://redis:6379
- HOST_DIRECTORY=${PWD}
- BENCHMARKING_NETWORK=${COMPOSE_PROJECT_NAME}_flatland-benchmarks
Expand Down
10 changes: 5 additions & 5 deletions evaluation/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
redis:
image: redis
ports:
- 6379:6379
- ${REDIS_PORT:-6379}:6379
restart: unless-stopped
logging:
options:
Expand Down Expand Up @@ -144,7 +144,7 @@ services:
- ./compute_worker/tasks_docker_compose.py:/app/tasks.py
env_file: .env
environment:
- BROKER_URL=pyamqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOST}:${RABBITMQ_PORT}//
- BROKER_URL=pyamqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOST}:5672//
- REDIS_IP=redis://redis:6379
- HOST_DIRECTORY=${PWD}
- BENCHMARKING_NETWORK=${COMPOSE_PROJECT_NAME}_flatland-benchmarks
Expand All @@ -168,10 +168,10 @@ services:

keycloak:
image: quay.io/keycloak/keycloak:23.0
# as we need to access keycloak from backend Docker container under docker internal port, we need to start Keycloak on 8081, port forwarding in Docker run is not enough
command: start-dev --import-realm --http-port 8081 --hostname localhost
# as we need to access keycloak from backend Docker container under docker internal port, we need to start Keycloak on configured port, port forwarding in Docker run is not enough
command: start-dev --import-realm --http-port ${KEYCLOAK_PORT:-8081} --hostname localhost
ports:
- 8081:8081
- ${KEYCLOAK_PORT:-8081}:${KEYCLOAK_PORT:-8081}
volumes:
# TODO can we avoid copying the realm config? Download in an init container from the repo....?
- ./keycloak/netzgrafikeditor-realm.json:/opt/keycloak/data/import/netzgrafikeditor-realm.json
Expand Down