Merge pull request #1480 from Websoft9/dev

Dev

Author: qiaofeng1227

.github/ISSUE_TEMPLATE/compose_create.md

@@ -18,10 +18,10 @@ source_code_url: "https://gitlab.com/websoft9/websoft9"
 # a brief and concise statementthat presents the main points for this application, shorter than 10 characters
 summary: "Open source Application self-hosting platform"
 # description of what the software does, shorter than 250 characters, sentence case
-description: "GitOps-driven, multi-application hosting for cloud servers and home servers, one-click deployment of 200+ open source apps."
+description: ""
 # list of license identifiers, see https://opensource.org/licenses for the full list of licenses
 licenses:
-  - LGPL-3.0
+  - MIT
 # (optional, true/false, default true) whether this application have Docker image
 Docker_image: true
 # (optional) link to an interactive demo of the software
@@ -59,4 +59,4 @@ Developer should develop this application's docker compose project at **Websoft9
 - [ ] system test
 - [ ] docs
 - [ ] add Notes content to docs
-- [ ] publish to RC release
+- [ ] publish to RC release

apps/airflow/.env

@@ -1,15 +1,15 @@
 W9_VERSION='2.10.4'
 W9_DIST='community'
 W9_REPO=apache/airflow
-W9_POWER_PASSWORD='gDm7t9ImuA!a162S'
+W9_POWER_PASSWORD='oqe!Qc7xO0cbPXzy'
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
 W9_ID='airflow'
 W9_HTTP_PORT=8080
 W9_HTTP_PORT_SET='8080'
 W9_DB_EXPOSE="postgresql"
 W9_URL='appname.example.com'
-W9_RCODE='euJs9NMJgXjz7'
+W9_RCODE='CinbOFvGG7NAG'
 W9_LOGIN_USER=admin
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
 W9_NETWORK=websoft9

apps/airflow/variables.json

@@ -8,7 +8,7 @@
     {
       "dist": "community",
       "version": [
-        "3.0.0b4",
+        "2.10.4",
         "latest"
       ]
     }

apps/filepizza/.env

@@ -1,53 +1,14 @@
-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"
+W9_REPO="kern/filepizza"
+W9_DIST='community'
+W9_VERSION='latest'
+W9_HTTP_PORT_SET='9001'
+W9_HTTP_PORT=8080
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
-W9_ID=filepizza
-
-# 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_URL_REPLACE=true
-
+W9_ID='filepizza'
+W9_URL='internet_ip:$W9_HTTP_PORT_SET'
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
-
 # Below environment is created by this app
-
-WORDPRESS_DB_HOST=$W9_ID-mariadb
-WORDPRESS_DB_USER=wordpress  #if use postgresql, it need set to postgres
-WORDPRESS_DB_PASSWORD=$W9_POWER_PASSWORD
-WORDPRESS_DB_NAME=wordpress
-
-
-#W9_NAME=""
-#W9_RCODE=""

apps/filepizza/Dockerfile

@@ -1,2 +1,2 @@
-# Appname
-## FAQ
+# filepizza
+# 使用需配置ssl证书 

apps/filepizza/Notes.md

@@ -1,48 +1,41 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# compose: https://github.com/kern/filepizza/blob/main/docker-compose.yml
+# image: https://hub.docker.com/r/kern/filepizza
 
 services:
 
-  wordpress:
-    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
-    volumes:
-      - wordpress:/var/www/html
-      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
-
-  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
+  redis:
+    container_name: $W9_ID-redis
+    image: redis:latest
     volumes:
-      - mysql_data:/var/lib/mysql
+      - redis_data:/data
+  coturn:
+    container_name: $W9_ID-coturn
+    image: coturn/coturn
+    # ports:
+    #   - 3478:3478
+    #   - 3478:3478/udp
+    #   - 5349:5349
+    #   - 5349:5349/udp
+      # Relay Ports
+      # - 49152-65535:49152-65535/udp
+    environment:
+      - DETECT_EXTERNAL_IP=yes
+      - DETECT_RELAY_IP=yes
+    command: -n --log-file=stdout --redis-userdb="ip=redis connect_timeout=30"
+  filepizza:
+    env_file: .env
+    container_name: $W9_ID
+    image: $W9_REPO:$W9_VERSION
+    ports:    
+      - $W9_HTTP_PORT_SET:8080
     environment:
-      MYSQL_DATABASE: $WORDPRESS_DB_NAME
-      MYSQL_USER: $WORDPRESS_DB_USER
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+      - PORT=8080
+      - REDIS_URL=redis://$W9_ID-redis:6379
+    depends_on:
+      - redis
 
 volumes:
-  wordpress:
-  mysql_data:
+  redis_data:
 
 networks:
   default: