diff --git a/compose.yml b/compose.yml index 88f76ef..e0876f2 100644 --- a/compose.yml +++ b/compose.yml @@ -2,43 +2,6 @@ version: "3.8" services: - db: - image: postgres:9.6-alpine - networks: &internalNetwork - - internal_network - volumes: - - postgres:/var/lib/postgresql/data - secrets: - - db_password - environment: - - POSTGRES_DB=${DB_NAME} - - POSTGRES_PASSWORD_FILE=/run/secrets/db_password - - POSTGRES_USER=${DB_USER} - - redis: - image: redis:6.2-alpine - networks: *internalNetwork - healthcheck: - test: ["CMD", "redis-cli", "ping"] - volumes: - - redis:/data - - es: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.17 - environment: - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - - "cluster.name=es-mastodon" - - "discovery.type=single-node" - - "bootstrap.memory_lock=true" - networks: - - internal_network - volumes: - - es:/usr/share/elasticsearch/data - ulimits: - memlock: - soft: -1 - hard: -1 - app: image: decentral1se/hometown:v1.0.5_3.4.0 command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" @@ -181,6 +144,43 @@ services: - WEB_DOMAIN - http_proxy # yes, this should be lowercase + db: + image: postgres:9.6-alpine + networks: &internalNetwork + - internal_network + volumes: + - postgres:/var/lib/postgresql/data + secrets: + - db_password + environment: + - POSTGRES_DB=${DB_NAME} + - POSTGRES_PASSWORD_FILE=/run/secrets/db_password + - POSTGRES_USER=${DB_USER} + + redis: + image: redis:6.2-alpine + networks: *internalNetwork + healthcheck: + test: ["CMD", "redis-cli", "ping"] + volumes: + - redis:/data + + es: + image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.17 + environment: + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + - "cluster.name=es-mastodon" + - "discovery.type=single-node" + - "bootstrap.memory_lock=true" + networks: + - internal_network + volumes: + - es:/usr/share/elasticsearch/data + ulimits: + memlock: + soft: -1 + hard: -1 + streaming: image: decentral1se/hometown:v1.0.5_3.4.0 command: node ./streaming