1
0
mirror of https://git.cloudron.io/cloudron/freshrss-app synced 2025-09-16 10:19:15 +00:00

Compare commits

..

13 Commits

Author SHA1 Message Date
Girish Ramakrishnan
71c8fc4d11 Version 1.7.3 2019-11-22 10:27:22 -08:00
Girish Ramakrishnan
da0021a5cf Fix tests 2019-11-22 10:26:47 -08:00
Girish Ramakrishnan
271c2d6970 Update FreshRSS to 1.15.3 2019-11-22 09:35:14 -08:00
Girish Ramakrishnan
3ded9d692d Version 1.7.2 2019-11-12 11:08:49 -08:00
Girish Ramakrishnan
0628b34f0d Update FreshRSS to 1.15.2 2019-11-12 10:53:23 -08:00
Girish Ramakrishnan
5956ca2427 Version 1.7.1 2019-11-06 14:58:28 -08:00
Girish Ramakrishnan
d26b15cb7b no need to actualize since that just refreshes the feeds 2019-11-06 14:48:06 -08:00
Girish Ramakrishnan
960dac68a8 Update extensions 2019-11-06 14:41:40 -08:00
Girish Ramakrishnan
af468d1d87 Update FreshRSS to 1.15.1 2019-11-06 14:32:37 -08:00
Girish Ramakrishnan
b880200be3 Version 1.7.0 2019-10-31 16:00:53 -07:00
Girish Ramakrishnan
22902c3d2e Update FreshRSS to 1.15.0 2019-10-31 15:56:46 -07:00
Girish Ramakrishnan
03f5d712f5 Version 1.6.3 2019-07-29 11:47:10 -07:00
Girish Ramakrishnan
d40f9e7743 Update FreshRSS to 1.14.3 2019-07-29 08:57:48 -07:00
6 changed files with 41 additions and 16 deletions

View File

@@ -112,3 +112,34 @@
* Update FreshRSS to 1.14.2
* Fix minor code syntax warning in API #2362
[1.6.3]
* Update FreshRSS to 1.14.3
* New configuration page for each category #2369
* Update shortcut configuration page #2405
* CSS style for printing #2149
* Do not hide multiple <br /> tags #2437
* Updated to jQuery 3.4.1 (only for statistics page) #2424
[1.7.0]
* Update FreshRSS to 1.15.0
* New archiving method, including maximum number of articles per feed, and settings at feed, category, global levels #2335
* New option to control category sort order #2592
* New option to display article authors underneath the article title #2487
* Add e-mail capability #2476, #2481
* Ability to define default user settings in data/config-user.custom.php #2490
* Including default feeds #2515
* Allow recreating users if they still exist in database #2555
* Add optional database connection URI parameters #2549, #2559
* Allow longer articles with MySQL / MariaDB (up to 16MB compressed instead of 64kB) #2448
* Add support for terms of service #2520
* Add sharing with Lemmy #2510
[1.7.1]
* Update FreshRSS to 1.15.1
[1.7.2]
* Update FreshRSS to 1.15.2
[1.7.3]
* Update FreshRSS to 1.15.3

View File

@@ -5,7 +5,7 @@
"description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG",
"tagline": "RSS feed reader",
"version": "1.6.2",
"version": "1.7.3",
"healthCheckPath": "/",
"httpPort": 8000,
"addons": {

View File

@@ -1,4 +1,4 @@
This app packages FreshRSS <upstream>1.14.2</upstream>.
This app packages FreshRSS <upstream>1.15.3</upstream>.
FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.

View File

@@ -3,12 +3,13 @@ FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c
RUN mkdir -p /app/code
WORKDIR /app/code
RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.14.2.tar.gz | tar -zxvf - --strip-components=1
ARG VERSION=1.15.3
RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
RUN mv data data-orig && ln -s /app/data data
# official extensions
RUN wget https://github.com/FreshRSS/Extensions/archive/0812ee05c24c5610e4a9fefbef372d49dafb447f.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
RUN wget https://github.com/FreshRSS/Extensions/archive/cd390eb8d1c950bbefacc986da700959c2bddd37.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
mv /app/code/extensions /app/code/extensions-orig && \
ln -s /app/data/extensions /app/code/extensions

View File

@@ -14,12 +14,10 @@ if ! [ -f /app/data/.installed ]; then
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
--disable_update
php cli/create-user.php --user admin --password changeme --language en
php cli/actualize-user.php --user admin
touch /app/data/.installed
echo "==> Done."
fi
echo "==> Symlinking log file"
rm -f /app/data/users/_/log_api.txt
touch /tmp/log_api.txt
@@ -33,7 +31,6 @@ for f in $(ls /app/code/extensions-orig); do
cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
done
echo "==> Updating config file"
php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}" \
--db-type mysql --db-host "${MYSQL_HOST}" \
@@ -41,11 +38,9 @@ php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}"
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
--disable_update
echo "==> Setting permissions"
chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
echo "==> Starting apache"
APACHE_CONFDIR="" source /etc/apache2/envvars
rm -f "${APACHE_PID_FILE}"

View File

@@ -73,9 +73,7 @@ describe('Application life cycle test', function () {
}
function login(password, callback) {
clearCache().then(function () {
return browser.get('https://' + app.fqdn);
}).then(function () {
browser.get('https://' + app.fqdn).then(function () {
return visible(by.id('loginButton'));
}).then(function () {
return browser.findElement(by.id('username')).sendKeys(username);
@@ -192,7 +190,7 @@ describe('Application life cycle test', function () {
});
it('install app', function () {
execSync('cloudron install --new --wait --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
});
it('can get app information', getAppInfo);
@@ -222,7 +220,7 @@ describe('Application life cycle test', function () {
it('move to different location', function () {
browser.manage().deleteAllCookies();
execSync('cloudron configure --wait --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
var inspect = JSON.parse(execSync('cloudron inspect'));
app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
expect(app).to.be.an('object');
@@ -240,7 +238,7 @@ describe('Application life cycle test', function () {
// test update
it('can install app', function () {
execSync('cloudron install --new --wait --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
});
it('can get app information', getAppInfo);
@@ -249,7 +247,7 @@ describe('Application life cycle test', function () {
it('can add users', addUser.bind(null, password));
it('can update', function () {
execSync('cloudron install --wait --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
execSync('cloudron update --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
var inspect = JSON.parse(execSync('cloudron inspect'));
app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
expect(app).to.be.an('object');