Merge pull request #1242 from Websoft9/update-freshrss-f658f27f

Update freshrss

Author: qiaofeng1227

apps/freshrss/.env

@@ -1,48 +1,16 @@
-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=freshrss
-
-# 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=freshrss/freshrss
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='SB3!eTzM4JF8GFuE'
+W9_HTTP_PORT_SET='9001'
+W9_ID='freshrss'
 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_URL='internet_ip:$W9_HTTP_PORT'
 
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
-
-# Below environment is created by apphub
-
-#W9_NAME=""
-#W9_RCODE=""
+# Below environment is created by this app: https://dockerhub.websoft9.com/r/freshrss/freshrss
+CRON_MIN="1,31"
+TZ="Europe/Paris"

apps/freshrss/Dockerfile

@@ -1,2 +1,16 @@
-# Appname
+# FreshRSS
+
+
+## Install Mark
+
+- BASE_URL Parameters below are only used at the very first run (so far)
+
+## Quickstart
+
+Complete install wizard which will create administrator account
+
+## Configs
+
+- Multiply languages with Chinese
+
 ## FAQ

apps/freshrss/Notes.md

@@ -1,48 +1,23 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# image,docs: https://dockerhub.websoft9.com/r/freshrss/freshrss
 
 services:
 
-  wordpress:
+  freshrss:
     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'
+        max-size: 10m
     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
-
+      - freshrss_data:/var/www/FreshRSS/data
+      - freshrss_extensions:/var/www/FreshRSS/extensions
 volumes:
-  wordpress:
-  mysql_data:
+  freshrss_data:
+  freshrss_extensions:
 
 networks:
   default:

apps/freshrss/docker-compose.yml

@@ -7,15 +7,13 @@
   "edition": [
     {
       "dist": "community",
-      "version": [
-        "latest"
-      ]
+      "version": ["1", "latest"]
     }
   ],
   "requirements": {
-    "cpu": "2",
-    "memory": "4",
-    "disk": "1",
+    "cpu": "1",
+    "memory": "1",
+    "disk": "2",
     "url": "https://freshrss.org"
   }
 }