From 461e76cdfc4f24ffefea8c730917dabaa405aa67 Mon Sep 17 00:00:00 2001 From: jared Date: Sun, 16 Jul 2023 01:09:48 -0400 Subject: [PATCH] rollback --- outline/docker-compose.yml | 118 +++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 57 deletions(-) diff --git a/outline/docker-compose.yml b/outline/docker-compose.yml index 052f474..d146dc7 100644 --- a/outline/docker-compose.yml +++ b/outline/docker-compose.yml @@ -1,68 +1,72 @@ -version: "3.2" +version: "2" services: - - outline: - image: docker.getoutline.com/outlinewiki/outline:latest - env_file: ./docker.env - ports: - - "3000:3000" - depends_on: - - postgres - - redis - - storage - - redis: - container_name: outline_redis + outline_redis: image: redis - env_file: ./docker.env - ports: - - "6379:6379" - volumes: - - ./redis.conf:/redis.conf - command: ["redis-server", "/redis.conf"] - healthcheck: - test: ["CMD", "redis-cli", "ping"] - interval: 10s - timeout: 30s - retries: 3 + restart: always + container_name: outline_redis - postgres: - container_name: outline_postgres + outline_postgres: image: postgres:13 - env_file: ./docker.env - ports: - - "5432:5432" + restart: always + container_name: outline_postgres + environment: + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_USER=outline + - POSTGRES_DB=outline volumes: - /var/lib/docker/volumes/outline/db:/var/lib/postgresql/data:Z - healthcheck: - test: ["CMD", "pg_isready"] - interval: 30s - timeout: 20s - retries: 3 - environment: - POSTGRES_USER: 'outline' - POSTGRES_PASSWORD: 'earpiece-purveyor-reggae' - POSTGRES_DB: 'outline' - storage: - container_name: outline_minio + outline_minio: image: minio/minio - env_file: ./docker.env - ports: - - "9000:9000" - entrypoint: sh - command: -c 'minio server' - deploy: - restart_policy: - condition: on-failure + restart: always + container_name: outline_minio volumes: - /var/lib/docker/volumes/outline/data:/data:Z - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] - interval: 30s - timeout: 20s - retries: 3 + environment: + - MINIO_ROOT_USER=minio + - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD} + - MINIO_BROWSER_REDIRECT_URL=${MINIO_BROWSER_REDIRECT_URL} + ports: + - 9000:9000 + - 9001:9001 + command: "server /data --console-address :9001" -volumes: - storage-data: - database-data: \ No newline at end of file + outline: + image: outlinewiki/outline + user: root + restart: always + container_name: outline + # command: sh -c "yarn sequelize:migrate && yarn start" + depends_on: + - outline_postgres + - outline_redis + - outline_minio + environment: + - PGSSLMODE=disable + - SECRET_KEY=${SECRET_KEY} + - UTILS_SECRET=${UTILS_SECRET} + - DATABASE_URL=postgres://outline:${POSTGRES_PASSWORD}@outline_postgres:5432/outline + - REDIS_URL=redis://outline_redis:6379 + - URL=${WIKI_URL} + - PORT=3000 + - AWS_ACCESS_KEY_ID=minio + - AWS_REGION=us-east-1 + - AWS_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD} + - AWS_S3_UPLOAD_BUCKET_URL=${WIKIDATA_URL} + - AWS_S3_UPLOAD_BUCKET_NAME=outline + - AWS_S3_UPLOAD_MAX_SIZE=26214400 + - AWS_S3_FORCE_PATH_STYLE=true + - AWS_S3_ACL=private + # - SLACK_KEY=505633415890.2395437869377 + # - SLACK_SECRET=114f1ba04f85ac91de711ee42353e73e + - FORCE_HTTPS=false + - OIDC_CLIENT_ID=outline + - OIDC_CLIENT_SECRET=${OIDC_SECRET} + - OIDC_AUTH_URI=${AUTH_URL}/api/oidc/authorize + - OIDC_TOKEN_URI=${AUTH_URL}/api/oidc/token + - OIDC_USERINFO_URI=${AUTH_URL}/api/oidc/userinfo + - OIDC_DISPLAY_NAME=Authelia + - OIDC_USERNAME_CLAIM=email + - OIDC_SCOPES=openid profile email + ports: + - 3000:3000