Merge pull request #1240 from Websoft9/update-gotify-538de502

Update gotify
Websoft9 · Jan 8, 2025 · 558b346 · 558b346
2 parents 4cb5f0c + e8b0ce7
commit 558b346
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 203 deletions.
diff --git a/apps/gotify/.env b/apps/gotify/.env
@@ -1,47 +1,17 @@
-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=gotify
-
-# 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_REPO=gotify/server
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='87XBLEAg#9L9DRyN'
+W9_HTTP_PORT_SET='9001'
+W9_ID='gotify'
 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_URL='internet_ip:$W9_HTTP_PORT_SET'
 W9_NETWORK=websoft9
 
-#### ----------------------------------------------------------------------------------------- ####
-
-
-# Below environment is created by apphub
 
-#W9_NAME=""
-#W9_RCODE=""
+#### Below environment is created by:https://gotify.net/docs/config#environment-variables ####
+GOTIFY_DEFAULTUSER_NAME=admin
+GOTIFY_DEFAULTUSER_PASS=$W9_POWER_PASSWORD
diff --git a/apps/gotify/Dockerfile b/apps/gotify/Dockerfile
diff --git a/apps/gotify/README.jinja2 b/apps/gotify/README.jinja2
diff --git a/apps/gotify/docker-compose.yml b/apps/gotify/docker-compose.yml
@@ -1,48 +1,20 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# docs: https://gotify.net/docs/install
+# image: https://hub.docker.com/r/gotify/server
 
 services:
 
-  wordpress:
+  gotify:
     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
-    volumes:
-      - mysql_data:/var/lib/mysql
-    environment:
-      MYSQL_DATABASE: $W9_ID
-      MYSQL_USER: $W9_ID
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+      - gotify_data:/app/data
 
 volumes:
-  wordpress:
-  mysql_data:
+  gotify_data:
 
 networks:
   default:

diff --git a/apps/gotify/src/after_up.sh b/apps/gotify/src/after_up.sh
diff --git a/apps/gotify/src/encrypt.sh b/apps/gotify/src/encrypt.sh
diff --git a/apps/gotify/src/filelist b/apps/gotify/src/filelist
diff --git a/apps/gotify/src/get_version.sh b/apps/gotify/src/get_version.sh
diff --git a/apps/gotify/src/nginx-proxy.conf.template b/apps/gotify/src/nginx-proxy.conf.template
diff --git a/apps/gotify/src/php_exra.ini b/apps/gotify/src/php_exra.ini
diff --git a/apps/gotify/src/replace_url.sh b/apps/gotify/src/replace_url.sh