Merge pull request #1244 from Websoft9/update-outline-53196307

Update outline

apps/outline/.env

@@ -1,47 +1,31 @@
-W9_REPO=wordpress
-W9_DIST=community
-W9_VERSION=latest
-
-W9_POWER_PASSWORD=1PrMxExC45LsCT
-
-# Environments which for user settings when create application
-# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
-W9_HTTP_PORT_SET=9001
-# W9_HTTPS_PORT_SET=9002
-# W9_DB_PORT_SET=3306
-# W9_SSH_PORT_SET=23
-W9_KEY_SET="dfsjdkjf77xjxcjcj"
-
-#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
-W9_ID=outline
-
-# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
-# Some container (e.g teleport) need HTTPS access, then need to set this pra
-W9_HTTP_PORT=80
-W9_HTTPS_PORT=81
-
-W9_LOGIN_USER=admin
-# use https://1password.com/zh-cn/password-generator/  to genarate 14 bit password
-# this password can also use password file
-W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
-W9_ADMIN_PATH="/wp-login"
-
-# Container name's suffix must use one of the value
-W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
-
-# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
-# If have protocols, should be set it in the APP's ENV
-W9_URL=internet_ip:$W9_HTTP_PORT_SET
-# modifies W9_URL on init when it is true
+W9_REPO=docker.getoutline.com/outlinewiki/outline
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='V1UQbr1#pE1WobAR'
+W9_HTTP_PORT_SET='9001'
+W9_ID='outline'
+W9_HTTP_PORT=3000
+W9_DB_EXPOSE="postgresql"
+W9_URL='internet_ip:$W9_HTTP_PORT_SET'
 W9_URL_REPLACE=true
-
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
 
-# Below environment is created by apphub
+# Below environment is created by this app: https://github.com/outline/outline/blob/main/.env.sample
+
+# This key is need, you can use `openssl rand -hex 32` in your terminal to create it
+SECRET_KEY=7a741498da0d8bb5180a902358fdd9cd110fc92fab42097be024b115524a64d6
+UTILS_SECRET=7a741498da0d8bb5180a902358fdd9cd110fc92fab42097be024b115524a64d6
+FILE_STORAGE=local
+URL=http://$W9_URL
+PORT=3000
+COLLABORATION_URL=http://$W9_URL
+PGSSLMODE=disable
+FORCE_HTTPS=false
+LOG_LEVEL=debug
+DATABASE_URL=postgres://postgres:postgres@$W9_ID-postgresql:5432/outline
 
-#W9_NAME=""
-#W9_RCODE=""
+NODE_ENV=production
+REDIS_URL=redis://$W9_ID-redis:6379

apps/outline/Notes.md

@@ -1,2 +1,5 @@
-# Appname
+# Outline
+
+- 
+
 ## FAQ

apps/outline/docker-compose.yml

@@ -1,48 +1,50 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# docs: https://docs.getoutline.com/s/hosting/doc/docker-7pfeLP5a8t
 
 services:
 
-  wordpress:
+  app:
     image: $W9_REPO:$W9_VERSION
     container_name: $W9_ID
     restart: unless-stopped
-    #This is for access host from container
-    # extra_hosts: ["host.docker.internal:host-gateway"]
-    # command: |
-    #   /bin/bash -c "ping -c 3 host.docker.internal"
-    logging:
-      driver: "json-file"
-      options:
-          max-file: "5"
-          max-size: 10m
-    deploy:
-      resources:
-        limits:
-          memory: 5g
-          cpus: '0.7'
     ports:
-      - $W9_HTTP_PORT_SET:80
-    env_file: .env
+      - $W9_HTTP_PORT_SET:3000
+    env_file: 
+      - .env
     volumes:
-      - wordpress:/var/www/html
-      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
+      - outline:/var/lib/outline/data
+    depends_on:
+      - postgres
+      - redis
 
-  mariadb:
-    image: mariadb:10.4
-    container_name: $W9_ID-mariadb
-    restart: unless-stopped
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
+  postgres:
+    image: postgres
+    container_name: $W9_ID-postgresql
     volumes:
-      - mysql_data:/var/lib/mysql
+      - postgres:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-d", "outline", "-U", "postgres"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
     environment:
-      MYSQL_DATABASE: $W9_ID
-      MYSQL_USER: $W9_ID
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+      POSTGRES_USER: 'postgres'
+      POSTGRES_PASSWORD: 'postgres'
+      POSTGRES_DB: 'outline'
+
+  redis:
+    image: redis
+    container_name: $W9_ID-redis
+    command: redis-server --bind 0.0.0.0 --loglevel verbose
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 30s
+      retries: 3
 
 volumes:
-  wordpress:
-  mysql_data:
+  outline:
+  postgres:
+  redis:
 
 networks:
   default: