diff options
| author | Felix <me@nutomic.com> | 2020-02-29 03:11:39 +0100 |
|---|---|---|
| committer | Felix <me@nutomic.com> | 2020-02-29 03:11:39 +0100 |
| commit | b854d8f3a0d484fd08bedc75e237fcc2c5eb4a67 (patch) | |
| tree | 593279b3876fb51793e572aeb3faf1d9a5415f41 /docker/federation-test | |
| parent | f9443dfbd3d542676385f37f68b60b0a61b48b2e (diff) | |
Some federation improvements
Diffstat (limited to 'docker/federation-test')
| -rw-r--r-- | docker/federation-test/docker-compose.yml | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/docker/federation-test/docker-compose.yml b/docker/federation-test/docker-compose.yml index 2a8b0fc3..39079d10 100644 --- a/docker/federation-test/docker-compose.yml +++ b/docker/federation-test/docker-compose.yml @@ -7,7 +7,7 @@ services: - "127.0.0.1:8540:8540" environment: - LEMMY_HOSTNAME=localhost:8540 - - LEMMY_DATABASE_URL=postgres://lemmy:password@lemmy_db_alpha:5432/lemmy + - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy - LEMMY_JWT_SECRET=changeme - LEMMY_FRONT_END_DIR=/app/dist - LEMMY_FEDERATION_ENABLED=true @@ -16,23 +16,16 @@ services: - RUST_BACKTRACE=1 restart: always depends_on: - - lemmy_db_alpha - lemmy_db_alpha: + - postgres_alpha + postgres_alpha: image: postgres:12-alpine environment: - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD} + - POSTGRES_PASSWORD=password - POSTGRES_DB=lemmy volumes: - - lemmy_db_alpha:/var/lib/postgresql/data + - ./volumes/postgres_alpha:/var/lib/postgresql/data restart: always - # lemmy_pictshare_alpha: - # image: shtripok/pictshare:latest - # ports: - # - "127.0.0.1:8550:80" - # volumes: - # - lemmy_pictshare_alpha:/usr/share/nginx/html/data - # restart: always lemmy_beta: image: lemmy-federation-test:latest @@ -40,7 +33,7 @@ services: - "127.0.0.1:8541:8541" environment: - LEMMY_HOSTNAME=localhost:8541 - - LEMMY_DATABASE_URL=postgres://lemmy:password@lemmy_db_beta:5432/lemmy + - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy - LEMMY_JWT_SECRET=changeme - LEMMY_FRONT_END_DIR=/app/dist - LEMMY_FEDERATION_ENABLED=true @@ -49,26 +42,13 @@ services: - RUST_BACKTRACE=1 restart: always depends_on: - - lemmy_db_beta - lemmy_db_beta: + - postgres_beta + postgres_beta: image: postgres:12-alpine environment: - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=${LEMMY_DATABASE_PASSWORD} + - POSTGRES_PASSWORD=password - POSTGRES_DB=lemmy volumes: - - lemmy_db_beta:/var/lib/postgresql/data + - ./volumes/postgres_beta:/var/lib/postgresql/data restart: always - # lemmy_pictshare_beta: - # image: shtripok/pictshare:latest - # ports: - # - "127.0.0.1:8551:80" - # volumes: - # - lemmy_pictshare_beta:/usr/share/nginx/html/data - # restart: always - -volumes: - lemmy_db_alpha: - # lemmy_pictshare_alpha: - lemmy_db_beta: - # lemmy_pictshare_beta: |