Skip to content

Commit

Permalink
Adjust dev setup to match main repo (OpenSlides#1489)
Browse files Browse the repository at this point in the history
Adjust dev setup to match main repo
jsangmeister authored Jan 10, 2023
1 parent fadaa00 commit 4cec82e
Showing 8 changed files with 58 additions and 97 deletions.
35 changes: 0 additions & 35 deletions .github/docker-compose/docker-compose.migrations.yml

This file was deleted.

36 changes: 21 additions & 15 deletions .github/docker-compose/docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,65 +1,71 @@
version: "3"
services:
backendAction:
backend-action:
build: ../..
image: openslides-backend
ports:
- "9002:9002"
environment:
- OPENSLIDES_BACKEND_COMPONENT=action
- DATASTORE_READER_HOST=reader
- DATASTORE_READER_HOST=datastore-reader
- DATASTORE_READER_PORT=9010
- DATASTORE_WRITER_HOST=writer
- DATASTORE_WRITER_HOST=datastore-writer
- DATASTORE_WRITER_PORT=9011
- DATASTORE_DATABASE_HOST=postgres
depends_on:
- writer
- reader
- datastore-writer
- datastore-reader
secrets:
- postgres_password
backendPresenter:
backend-presenter:
build: ../..
image: openslides-backend
ports:
- "9003:9003"
environment:
- OPENSLIDES_BACKEND_COMPONENT=presenter
- DATASTORE_READER_HOST=reader
- DATASTORE_READER_HOST=datastore-reader
- DATASTORE_READER_PORT=9010
- DATASTORE_WRITER_HOST=writer
- DATASTORE_WRITER_HOST=datastore-writer
- DATASTORE_WRITER_PORT=9011
- DATASTORE_DATABASE_HOST=postgres
depends_on:
- writer
- reader
- datastore-writer
- datastore-reader
secrets:
- postgres_password
reader:
datastore-reader:
build:
context: "https://github.com/OpenSlides/openslides-datastore-service.git#main"
args:
MODULE: "reader"
PORT: "9010"
image: openslides-datastore-reader
environment:
- DATASTORE_DATABASE_HOST=postgres
ports:
- "9010:9010"
depends_on:
- postgresql
- postgres
secrets:
- postgres_password
writer:
datastore-writer:
build:
context: "https://github.com/OpenSlides/openslides-datastore-service.git#main"
args:
MODULE: "writer"
PORT: "9011"
image: openslides-datastore-writer
environment:
- DATASTORE_DATABASE_HOST=postgres
ports:
- "9011:9011"
depends_on:
- postgresql
- postgres
- redis
secrets:
- postgres_password
postgresql:
postgres:
image: postgres:11
environment:
- POSTGRES_USER=openslides
4 changes: 2 additions & 2 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
@@ -27,12 +27,12 @@ jobs:
- name: Wait for action service
# we have to execute this inside the container since the port to the outside is opened directly after the
# container started, while the code itself is not ready yet
run: docker-compose -f docker-compose.prod.yml exec -T backendAction scripts/wait.sh backendAction 9002
run: docker-compose -f docker-compose.prod.yml exec -T backend-action scripts/wait.sh backend-action 9002

- name: Wait for presenter service
# we have to execute this inside the container since the port to the outside is opened directly after the
# container started, while the code itself is not ready yet
run: docker-compose -f docker-compose.prod.yml exec -T backendPresenter scripts/wait.sh backendPresenter 9003
run: docker-compose -f docker-compose.prod.yml exec -T backend-presenter scripts/wait.sh backend-presenter 9003

- name: Fire a test request to actions component
run: curl localhost:9002/system/action/health
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -27,3 +27,6 @@ openslides_backend/htmlcov

migrations/*.json
migrations/*.sql

# secrets
secrets/
4 changes: 2 additions & 2 deletions dev/dc.local.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ services:
environment:
- PYTHONPATH=/app:/datastore-service
- MYPYPATH=/app:/datastore-service
writer:
datastore-writer:
build:
context: ../../openslides-datastore-service/
dockerfile: Dockerfile.dev
@@ -26,7 +26,7 @@ services:
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
- DATASTORE_DATABASE_NAME=openslides
- DATASTORE_DATABASE_USER=openslides
- DATASTORE_DATABASE_HOST=postgresql
- DATASTORE_DATABASE_HOST=postgres
- MESSAGE_BUS_HOST=redis
volumes:
- ../../openslides-datastore-service/datastore:/app/datastore
67 changes: 27 additions & 40 deletions dev/docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -18,20 +18,21 @@ services:
- ../global:/app/global
- ../scripts:/app/scripts
environment:
- DATASTORE_READER_HOST=reader
- DATASTORE_READER_HOST=datastore-reader
- DATASTORE_READER_PORT=9010
- DATASTORE_WRITER_HOST=writer
- DATASTORE_WRITER_HOST=datastore-writer
- DATASTORE_WRITER_PORT=9011
- AUTH_HOST=auth
- MESSAGE_BUS_HOST=redis
- DATASTORE_DATABASE_HOST=postgres
depends_on:
- writer
- datastore-writer
networks:
- datastore
- postgresql
- postgres
- auth
- redis
reader:
datastore-reader:
build:
context: "https://github.com/OpenSlides/openslides-datastore-service.git#main"
args:
@@ -42,12 +43,13 @@ services:
- "9010:9010"
environment:
- OPENSLIDES_DEVELOPMENT=1
- DATASTORE_DATABASE_HOST=postgres
depends_on:
- postgresql
- postgres
networks:
- datastore
- postgresql
writer:
- postgres
datastore-writer:
build:
context: "https://github.com/OpenSlides/openslides-datastore-service.git#main"
args:
@@ -58,12 +60,13 @@ services:
- "9011:9011"
environment:
- OPENSLIDES_DEVELOPMENT=1
- DATASTORE_DATABASE_HOST=postgres
depends_on:
- postgresql
- postgres
- redis
networks:
- datastore
- postgresql
- postgres
- redis
auth:
build:
@@ -74,21 +77,19 @@ services:
- "9004:9004"
environment:
- MESSAGE_BUS_HOST=redis
- CACHE_HOST=cache
- DATASTORE_READER_HOST=reader
- CACHE_HOST=redis
- DATASTORE_READER_HOST=datastore-reader
- DATASTORE_READER_PORT=9010
- DATASTORE_WRITER_HOST=writer
- DATASTORE_WRITER_HOST=datastore-writer
- DATASTORE_WRITER_PORT=9011
depends_on:
- reader
- writer
- datastore-reader
- datastore-writer
- redis
- cache
networks:
- datastore
- auth
- redis
- cache
vote:
build:
context: "https://github.com/OpenSlides/openslides-vote-service.git#main"
@@ -98,54 +99,40 @@ services:
environment:
- OPENSLIDES_DEVELOPMENT=1
- VOTE_HOST=vote
- DATASTORE_READER_HOST=reader
- DATASTORE_READER_HOST=datastore-reader
- MESSAGING=redis
- MESSAGE_BUS_HOST=redis
- VOTE_REDIS_HOST=cache
- VOTE_DATABASE_HOST=postgresql
- VOTE_REDIS_HOST=redis
- VOTE_DATABASE_HOST=postgres
- VOTE_DATABASE_USER=openslides
- VOTE_DATABASE_PASSWORD=openslides
- VOTE_DATABASE_NAME=openslides
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
- DATASTORE_DATABASE_NAME=openslides
- DATASTORE_DATABASE_USER=openslides
- DATASTORE_DATABASE_HOST=postgresql
- AUTH=ticket
- DATASTORE_DATABASE_HOST=postgres
- AUTH_HOST=auth
depends_on:
- reader
- datastore-reader
- redis
- auth
- cache
networks:
- datastore
- redis
- auth
- cache
- postgresql
postgresql:
- postgres
postgres:
image: postgres:11
environment:
- POSTGRES_USER=openslides
- POSTGRES_PASSWORD=openslides
- POSTGRES_DB=openslides
networks:
- postgresql
- postgres
redis:
image: redis:alpine
ports:
- "6379:6379"
networks:
- redis
cache:
image: redis:alpine
expose:
- 6379
networks:
- cache
networks:
datastore:
postgresql:
postgres:
redis:
cache:
auth:
4 changes: 2 additions & 2 deletions dev/run-tests.sh
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@ export COMPOSE_DOCKER_CLI_BUILD=0
DC="docker-compose -f dev/docker-compose.dev.yml"

$DC up --build --detach
$DC exec -T backend scripts/wait.sh writer 9011
$DC exec -T backend scripts/wait.sh reader 9010
$DC exec -T backend scripts/wait.sh datastore-writer 9011
$DC exec -T backend scripts/wait.sh datastore-reader 9010
$DC exec -T backend scripts/wait.sh auth 9004
$DC exec -T backend ./entrypoint.sh pytest --cov
error=$?
2 changes: 1 addition & 1 deletion scripts/export_datastore_variables.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export DATASTORE_DATABASE_HOST=${DATASTORE_DATABASE_HOST:-postgresql}
export DATASTORE_DATABASE_HOST=${DATASTORE_DATABASE_HOST:-postgres}
export DATASTORE_DATABASE_PORT=${DATASTORE_DATABASE_PORT:-5432}
export DATASTORE_DATABASE_USER=${DATASTORE_DATABASE_USER:-openslides}
export DATASTORE_DATABASE_NAME=${DATASTORE_DATABASE_NAME:-openslides}

0 comments on commit 4cec82e

Please sign in to comment.