1
0
mirror of https://git.cloudron.io/cloudron/freshrss-app synced 2025-10-05 19:07:04 +00:00

Compare commits

..

6 Commits

Author SHA1 Message Date
Dennis Schwerdel
ddb0abe0fe Version 0.5.0 2017-06-01 10:51:12 +02:00
Dennis Schwerdel
6baf0d59f9 Setting some php options, also session path (closes #9) 2017-06-01 10:47:09 +02:00
Dennis Schwerdel
1d57f0f321 Symlinking log_api.txt to /tmp (closes #7) 2017-06-01 10:46:06 +02:00
Dennis Schwerdel
f7db98f93d Removed mysql port as this causes an error now 2017-06-01 10:44:31 +02:00
Dennis Schwerdel
a8dc7cb6bf Changed test running instructions 2017-06-01 10:43:49 +02:00
Dennis Schwerdel
83ee152f4f Changed test location to test 2017-06-01 10:43:14 +02:00
6 changed files with 29 additions and 8 deletions

View File

@@ -18,3 +18,9 @@
[0.4.1]
* Add parameter to allow for encoded slashes (thanks @Richard)
* Updated description (thanks @Girish)
[0.5.0]
* Not using mysql port as this causes an error
* Storing sessions in /run
* Storing api logs in /tmp
* Set some php options

View File

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

View File

@@ -40,7 +40,15 @@ RUN rm /etc/apache2/sites-enabled/* \
&& a2ensite freshrss
RUN rm -rf /var/lib/php \
&& ln -s /run/php /var/lib/php
&& ln -s /run/php /var/lib/php \
&& mkdir -p /run/php/session
RUN crudini --set /etc/php/7.0/apache2/php.ini PHP upload_max_filesize 64M && \
crudini --set /etc/php/7.0/apache2/php.ini PHP post_max_size 64M && \
crudini --set /etc/php/7.0/apache2/php.ini PHP memory_limit 64M && \
crudini --set /etc/php/7.0/apache2/php.ini Session session.save_path /run/php/session && \
crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_probability 1 && \
crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_divisor 100
ADD start.sh /app/code/start.sh

View File

@@ -31,7 +31,6 @@ The e2e tests are located in the `test/` folder and require [nodejs](http://node
cd freshrss-app/test
npm install
export PATH=$PATH:node_modules/.bin
mocha --bail test.js
PATH=$PATH:node_modules/.bin mocha --bail test.js
```

View File

@@ -9,7 +9,7 @@ if ! [ -f /app/data/.installed ]; then
rsync -a /app/code/data-orig/ /app/data/
php cli/do-install.php \
--environment production --default_user admin \
--db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
--db-type mysql --db-host "${MYSQL_HOST}" \
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
--disable_update
@@ -19,6 +19,14 @@ if ! [ -f /app/data/.installed ]; then
echo "Done."
fi
echo "Symlinking log file"
rm -f /app/data/users/_/log_api.txt
touch /tmp/log_api.txt
ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
echo "Symlinking packaged extensions"
mkdir -p /app/data/extensions
for f in $(ls /app/code/extensions-orig); do
if ! [ -e "/app/data/extensions/$f" ]; then
@@ -29,14 +37,14 @@ done
echo "Updating config file"
php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}/p" \
--db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
--db-type mysql --db-host "${MYSQL_HOST}" \
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
--disable_update
echo "Setting permissions"
chown -R www-data.www-data /run/php /app/data
chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
echo "Starting apache"

View File

@@ -38,7 +38,7 @@ describe('Application life cycle test', function () {
done();
});
var LOCATION = 'freshrss-test';
var LOCATION = 'test';
var TEST_TIMEOUT = 10000;
var app;