diff --git a/docker-compose.yaml b/docker-compose.yaml index f256422..790f461 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,8 +3,6 @@ services: pleroma_db: image: postgres:15 - networks: - - pleroma_internal_network healthcheck: test: ['CMD', 'pg_isready', '-U', 'postgres'] volumes: @@ -20,8 +18,9 @@ services: pleroma_web: image: pleroma_selfbuilt networks: - - pleroma_internal_network - - pleroma_external_network + default: + aliases: + - pleroma.pubtester.local healthcheck: test: [ @@ -59,8 +58,6 @@ services: mastodon_db: image: postgres:15 shm_size: 256mb - networks: - - internal_network healthcheck: test: ['CMD', 'pg_isready', '-U', 'postgres'] volumes: @@ -73,8 +70,6 @@ services: mastodon_redis: restart: always image: redis:7-alpine - networks: - - internal_network healthcheck: test: ['CMD', 'redis-cli', 'ping'] volumes: @@ -85,8 +80,10 @@ services: env_file: .env.mastodon command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" networks: - - external_network - - internal_network + default: + aliases: + - mastodon.pubtester.local + healthcheck: # prettier-ignore test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1'] @@ -102,9 +99,6 @@ services: restart: always env_file: .env.mastodon command: node ./streaming - networks: - - external_network - - internal_network healthcheck: # prettier-ignore test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1'] @@ -121,9 +115,6 @@ services: depends_on: - mastodon_db - mastodon_redis - networks: - - external_network - - internal_network volumes: - ./data/mastodon/public/system:/mastodon/public/system healthcheck: @@ -132,11 +123,6 @@ services: # nginx reverse proxy configured for all instances nginx: image: nginx:1.23.1-alpine - networks: - - external_network - - internal_network - - pleroma_external_network - - pleroma_internal_network volumes: - ./files/nginx.conf:/etc/nginx/nginx.conf:ro ports: @@ -145,11 +131,3 @@ services: - mastodon_web - mastodon_streaming - pleroma_web - -networks: - external_network: - internal_network: - internal: true - pleroma_external_network: - pleroma_internal_network: - internal: true