diff --git a/docker-compose.yml b/docker-compose.yml index ce1b25af5..2fa996ef3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,50 +1,29 @@ version: "3" services: - web: - build: . - restart: always - links: - - db - - redis - # - es - ports: - - "127.0.0.1:3000:3000" - networks: - - internal_network - - external_network - volumes: - - ./files:/misskey/files - - ./.config:/misskey/.config:ro - - redis: - restart: always - image: redis:4.0-alpine - networks: - - internal_network - volumes: - - ./redis:/data - db: restart: always image: postgres:12.2-alpine + ports: + - "5432:5432" networks: - internal_network + - external_network env_file: - .config/docker.env volumes: - ./db:/var/lib/postgresql/data -# es: -# restart: always -# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2 -# environment: -# - "ES_JAVA_OPTS=-Xms512m -Xmx512m" -# - "TAKE_FILE_OWNERSHIP=111" -# networks: -# - internal_network -# volumes: -# - ./elasticsearch:/usr/share/elasticsearch/data + redis: + restart: always + image: redis:4.0-alpine + ports: + - "6379:6379" + networks: + - internal_network + - external_network + volumes: + - ./redis:/data networks: internal_network: diff --git a/packages/client/src/components/global/header.vue b/packages/client/src/components/global/header.vue index e558614c1..3f8efed69 100644 --- a/packages/client/src/components/global/header.vue +++ b/packages/client/src/components/global/header.vue @@ -25,6 +25,7 @@
+