From d3ff94f1e12ca21339829112ac080c9b0172eb6e Mon Sep 17 00:00:00 2001 From: websoft9 Date: Thu, 9 Jan 2025 04:11:43 +0000 Subject: [PATCH] Update freshrss --- apps/freshrss/.env | 52 ++++++-------------------------- apps/freshrss/Dockerfile | 21 ------------- apps/freshrss/Notes.md | 16 +++++++++- apps/freshrss/docker-compose.yml | 39 +++++------------------- apps/freshrss/variables.json | 10 +++--- 5 files changed, 36 insertions(+), 102 deletions(-) delete mode 100644 apps/freshrss/Dockerfile diff --git a/apps/freshrss/.env b/apps/freshrss/.env index f8eb36cfb..1be9af4d9 100644 --- a/apps/freshrss/.env +++ b/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="" \ No newline at end of file +# Below environment is created by this app: https://dockerhub.websoft9.com/r/freshrss/freshrss +CRON_MIN="1,31" +TZ="Europe/Paris" diff --git a/apps/freshrss/Dockerfile b/apps/freshrss/Dockerfile deleted file mode 100644 index 4364b46fb..000000000 --- a/apps/freshrss/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# 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"] diff --git a/apps/freshrss/Notes.md b/apps/freshrss/Notes.md index 1fdbbb29d..43a3d0e79 100644 --- a/apps/freshrss/Notes.md +++ b/apps/freshrss/Notes.md @@ -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 diff --git a/apps/freshrss/docker-compose.yml b/apps/freshrss/docker-compose.yml index b501aed86..6160f4433 100644 --- a/apps/freshrss/docker-compose.yml +++ b/apps/freshrss/docker-compose.yml @@ -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: diff --git a/apps/freshrss/variables.json b/apps/freshrss/variables.json index a4fa7b97a..d6a7f84cc 100644 --- a/apps/freshrss/variables.json +++ b/apps/freshrss/variables.json @@ -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" } }