Merge pull request #1111 from Websoft9/dev

Dev

.github/ISSUE_TEMPLATE/compose_create.md

@@ -34,7 +34,7 @@ Before deveopment, repository owner should complete below Assessment:
 
 - [ ] This application have **3** containers
 - [ ] official architecture research
-- [ ] Complete the Contentful data for 
+- [ ] Complete the Contentful data
 - [ ] Create app project structure from template
 
 

.github/workflows/release.yml

@@ -15,22 +15,34 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         name: Check out code
+        with:
+          ref: ${{ github.ref }}  # 使用触发事件的分支
 
       - name: Version convert
         id: convert_version      
         run: |
-          curl https://raw.githubusercontent.com/Websoft9/websoft9/main/docker/apphub/Dockerfile -o Dockerfile
+          curl https://raw.githubusercontent.com/Websoft9/websoft9/${{ github.ref_name }}/docker/apphub/Dockerfile -o Dockerfile
 
           library_tag=$(grep 'ARG LIBRARY_VERSION' "Dockerfile" | cut -d'"' -f2 | xargs)
           apphub_tag=$(grep 'LABEL version' "Dockerfile" | cut -d'"' -f2 | xargs)
 
+          # Determine the channel based on the branch and apphub_tag
+          if [[ "${GITHUB_REF##*/}" == "dev" ]]; then
+            echo "CHANNEL=dev" >> $GITHUB_ENV
+          elif [[ "${GITHUB_REF##*/}" == "main" ]]; then
+            if [[ "$apphub_tag" == *"-"* ]]; then
+              echo "CHANNEL=rc" >> $GITHUB_ENV
+            else
+              echo "CHANNEL=release" >> $GITHUB_ENV
+            fi
+          fi
+
+          # Set library_tag_gh based on apphub_tag
           if [[ "$apphub_tag" == *"-"* ]]; then
             suffix="${apphub_tag#*-}"
             library_tag_gh="${library_tag}-${suffix}"
-            echo "CHANNEL=dev" >> $GITHUB_ENV
           else
             library_tag_gh=$library_tag
-            echo "CHANNEL=release" >> $GITHUB_ENV
           fi
 
           echo "LIBRARY_TAG=$library_tag" >> $GITHUB_ENV
@@ -84,16 +96,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}  # 使用触发事件的分支
 
       - name: Setup Pages
         uses: actions/configure-pages@v4
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
-        with:
-          # Upload entire repository
-          path: '.'
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v3
+        uses: actions

add_apps.json

@@ -1,10 +1,10 @@
 [
   {
-    "name": "neko",
-    "trademark": "Neko",
+    "name": "ttrss",
+    "trademark": "TinyTinyRSS",
     "release": false,
-    "fork_url": "https://github.com/m1k1o/neko",
-    "version_from": "https://hub.docker.com/r/elestio/neko/tags",
+    "fork_url": "https://tt-rss.org/wiki/InstallationNotes/",
+    "version_from": "https://hub.docker.com/r/cthulhoo/ttrss-fpm-pgsql-static/tags",
     "edition": [
       {
         "dist": "community",
@@ -17,7 +17,7 @@
       "cpu": "2",
       "memory": "4",
       "disk": "1",
-      "url": "https://github.com/onlyoffice/docker#recommended-system-requirements"
+      "url": "https://tt-rss.org/"
     }
   }
-]
+]

apps/commafeed/.env

@@ -0,0 +1,48 @@
+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=commafeed
+
+# 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, http(s)://IP:PORT
+W9_URL=internet_ip:$W9_HTTP_PORT
+# modifies W9_URL on init when it is true
+W9_URL_REPLACE=true
+
+W9_URL_WITH_PORT=false
+
+W9_NETWORK=websoft9
+
+#### ----------------------------------------------------------------------------------------- ####
+
+
+# Below environment is created by apphub
+
+#W9_NAME=""
+#W9_RCODE=""

apps/commafeed/CHANGELOG.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## Release
+### Fixes and Enhancements
+

apps/commafeed/Dockerfile

@@ -0,0 +1,21 @@
+# image: https://hub.docker.com/r/websoft9dev/discuzq
+
+FROM ccr.ccs.tencentyun.com/discuzq/dzq:latest
+
+LABEL org.opencontainers.image.authors="https://www.websoft9.com" \
+      org.opencontainers.image.description="Application packaged by Websoft9" \
+      org.opencontainers.image.source="https://github.com/Websoft9/docker-library/tree/main/apps/opencart" \
+      org.opencontainers.image.title="OpenCart" \
+      org.opencontainers.image.vendor="Websoft9 Inc." \
+      org.opencontainers.image.version="4.0.1.1"
+
+ENV DISCUZQ_MYSQL_HOST=mysql
+ENV DISCUZQ_MYSQL_USER=discuzq
+ENV DISCUZQ_MYSQL_PASSWORD=discuzq
+ENV DISCUZQ_MYSQL_DATABASE=discuzq
+ENV DISCUZQ_SITENAME=DiscuzQ
+
+COPY cmd.sh /tmp
+RUN chmod +x /tmp/cmd.sh
+
+CMD ["/tmp/cmd.sh"]

apps/commafeed/Notes.md

@@ -0,0 +1,2 @@
+# Appname
+## FAQ

apps/commafeed/README.jinja2

@@ -0,0 +1,26 @@
+# {{trademark}} on Docker  
+
+This is an **Docker Compose solution** powered by [Websoft9](https://www.websoft9.com) based on Docker for {{trademark}}:
+
+{% for ed in edition %}
+ - {{ed.dist}}:  {{ ed.version | join(', ') }}
+{% endfor %}
+
+## System Requirements
+
+The following are the minimal [recommended requirements]({{requirements.url}}):
+
+* **RAM**: {{requirements.memory}} GB or more
+* **CPU**: {{requirements.cpu}} cores or higher
+* **Disk**: at least {{requirements.disk}} GB of free space
+* **bandwidth**: more fluent experience over 100M  
+
+## Install
+
+You can install this {{trademark}} by [How to use it?](https://github.com/Websoft9/docker-library#how-to-use-it).   
+
+If you want use {{trademark}} with **Websoft9 Business Support** free, you can [subscribe {{trademark}}](https://www.websoft9.com/apps) on Cloud platform
+
+## Documentation
+
+[{{trademark}} Administrator Guide](https://support.websoft9.com/docs/{{name}}) powered by Websoft9

apps/commafeed/docker-compose.yml

@@ -0,0 +1,50 @@
+# image,docs: https://hub.docker.com/_/wordpress/
+
+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
+    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
+
+volumes:
+  wordpress:
+  mysql_data:
+
+networks:
+  default:
+    name: $W9_NETWORK
+    external: true

apps/commafeed/src/README.md

@@ -0,0 +1,3 @@
+# About
+
+This folder includes files mount to container and used by Websoft9

apps/commafeed/src/after_up.sh

@@ -0,0 +1 @@
+

apps/commafeed/src/encrypt.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+clear
+
+
+
+# Add encrypt script below if use W9_ENCRYPT_PASSWORD at .env file
+# ------------- start -------------------------
+
+
+
+# ------------- end ---------------------------

apps/commafeed/src/filelist

@@ -0,0 +1,3 @@
+docker-compose.yml
+script/test.sh
+docker

apps/commafeed/src/get_version.sh

@@ -0,0 +1 @@
+

apps/commafeed/src/nginx-proxy.conf

@@ -0,0 +1,57 @@
+# proxy_busy_buffers_size   512k;
+# proxy_buffers   4 512k;
+# proxy_buffer_size   256k;
+# client_max_body_size 50m;
+# # override default location /
+# location / {
+#         add_header       X-Served-By $host;
+#         proxy_set_header Host $host;
+#         proxy_set_header X-Forwarded-Scheme $scheme;
+#         proxy_set_header X-Forwarded-Proto  $scheme;
+#         proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+#         proxy_set_header X-Real-IP          $remote_addr;
+#         proxy_pass       $forward_scheme://$server:$port$request_uri;
+#         proxy_set_header Upgrade $http_upgrade;
+#         proxy_set_header Connection upgrade;
+#     }
+
+# location /console {
+#     proxy_pass http://$server:8080; 
+#     proxy_http_version 1.1;
+#     proxy_set_header Host $http_host;
+#     proxy_set_header X-Real-IP $remote_addr;
+#     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#     proxy_set_header X-Forwarded-Proto $scheme;
+# }
+
+# # for echo some useful information
+# location / {
+#     default_type text/plain;
+#     return 200 'Hello World';
+# }
+
+# location /oida/ {
+# # this is the address and port of the ORDS installation
+# proxy_pass http://127.0.0.1:8080/ords/;
+
+# # set Origin to blank to avoid Chrome problems with CORS
+# proxy_set_header Origin "" ;
+
+# # pass along some header variables with the public host name/port/and so on
+# proxy_set_header Host $host;
+# proxy_set_header X-Forwarded-Host $host:$server_port;
+# proxy_set_header X-Real-IP $remote_addr;
+# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# proxy_set_header X-Forwarded-Proto $scheme;
+
+# # this reverse proxies any "location" headers being passed in the response
+# proxy_redirect http://$host/ords/ https://$host/oida/;
+
+# # also tell cookies their public path
+# proxy_cookie_path /ords/ /oida/;
+
+# # reverse proxy links included in response (ie from ORDS webservice)
+# sub_filter_types application/json ;
+# sub_filter http://$host/ords/ https://$host/oida/;
+# sub_filter_once off;
+# }

apps/commafeed/src/php_exra.ini

@@ -0,0 +1,8 @@
+file_uploads = On
+max_input_time = 800
+max_execution_time = 300
+memory_limit = 600M
+upload_max_filesize = 900M
+post_max_size = 900M
+max_file_uploads = 200
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT

apps/commafeed/src/replace_url.sh

@@ -0,0 +1 @@
+# some application have write url to database or config file, once replaced url at .env, it should replace it at config file or database

apps/commafeed/variables.json

@@ -0,0 +1,21 @@
+{
+  "name": "commafeed",
+  "trademark": "CommaFeed",
+  "release": false,
+  "fork_url": "https://hub.docker.com/r/athou/commafeed",
+  "version_from": "https://hub.docker.com/r/athou/commafeed/tags",
+  "edition": [
+    {
+      "dist": "community",
+      "version": [
+        "latest"
+      ]
+    }
+  ],
+  "requirements": {
+    "cpu": "2",
+    "memory": "4",
+    "disk": "1",
+    "url": "https://www.commafeed.com/"
+  }
+}

apps/docuseal/.env

@@ -1,13 +1,12 @@
 W9_REPO=docuseal/docuseal
-W9_VERSION=latest
-W9_DIST=community
-W9_POWER_PASSWORD=urtghkikljee9u
-
-W9_ID=docuseal
+W9_VERSION='latest'
+W9_DIST='community'
+W9_ID='docuseal'
 # Port Configuration
 W9_HTTP_PORT=3000
-W9_HTTP_PORT_SET=3000
+W9_HTTP_PORT_SET='3000'
 W9_NETWORK=websoft9
+W9_URL="docuseal.test2.websoft9.cn"
 
-#Docuseal Configuration
-DATABASE_URL=postgresql://docuseal:$W9_POWER_PASSWORD@$W9_ID-postgres:5432/docuseal
+#Docuseal Configuration docs: https://www.docuseal.com/docs/configuring-docuseal-via-environment-variables
+#DATABASE_URL=postgresql://postgres:postgres@postgres:5432/docuseal

apps/docuseal/CHANGELOG.md

@@ -3,3 +3,5 @@
 ## Release
 
 ### Fixes and Enhancements
+
+2024-12-17 first release