Updated to 1.6.3, removed custom patches
This commit is contained in:
parent
a5022969c3
commit
497199febd
|
@ -10,3 +10,7 @@
|
||||||
* Using cli scripts
|
* Using cli scripts
|
||||||
* Using scheduler for periodic task
|
* Using scheduler for periodic task
|
||||||
* Removed update menu item
|
* Removed update menu item
|
||||||
|
|
||||||
|
[0.4.0]
|
||||||
|
* Updated to FreshRSS 1.6.3
|
||||||
|
* Removed most custom patches (FreshRSS includes those now)
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"description": "file://DESCRIPTION.md",
|
"description": "file://DESCRIPTION.md",
|
||||||
"changelog": "file://CHANGELOG",
|
"changelog": "file://CHANGELOG",
|
||||||
"tagline": "RSS feed reader",
|
"tagline": "RSS feed reader",
|
||||||
"version": "0.3.0",
|
"version": "0.4.0",
|
||||||
"healthCheckPath": "/",
|
"healthCheckPath": "/",
|
||||||
"httpPort": 8000,
|
"httpPort": 8000,
|
||||||
"addons": {
|
"addons": {
|
||||||
|
|
|
@ -7,7 +7,7 @@ RUN apt-get update \
|
||||||
&& apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
|
&& apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
|
||||||
libapache2-mod-php mysql-client php-mysql
|
libapache2-mod-php mysql-client php-mysql
|
||||||
|
|
||||||
ENV VERSION 1.6.2
|
ENV VERSION 1.6.3
|
||||||
ENV EXTENSIONS_VERSION eac4b749775c3e1b584c1a6b4a4487e4a4b8b159
|
ENV EXTENSIONS_VERSION eac4b749775c3e1b584c1a6b4a4487e4a4b8b159
|
||||||
|
|
||||||
RUN mkdir -p /app/code
|
RUN mkdir -p /app/code
|
||||||
|
@ -42,10 +42,6 @@ RUN rm /etc/apache2/sites-enabled/* \
|
||||||
RUN rm -rf /var/lib/php \
|
RUN rm -rf /var/lib/php \
|
||||||
&& ln -s /run/php /var/lib/php
|
&& ln -s /run/php /var/lib/php
|
||||||
|
|
||||||
ADD remove-update-menu.patch /app/code/remove-update-menu.patch
|
|
||||||
RUN patch -p0 -d /app/code < /app/code/remove-update-menu.patch
|
|
||||||
|
|
||||||
ADD start.sh /app/code/start.sh
|
ADD start.sh /app/code/start.sh
|
||||||
ADD set_config.php /app/code/set_config.php
|
|
||||||
|
|
||||||
CMD [ "/app/code/start.sh" ]
|
CMD [ "/app/code/start.sh" ]
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
diff -Naru app-orig/layout/aside_configure.phtml app/layout/aside_configure.phtml
|
|
||||||
--- app-orig/layout/aside_configure.phtml 2016-12-26 15:33:47.000000000 +0000
|
|
||||||
+++ app/layout/aside_configure.phtml 2017-02-23 14:48:10.214072522 +0000
|
|
||||||
@@ -41,9 +41,5 @@
|
|
||||||
Minz_Request::actionName() === 'checkInstall' ? ' active' : ''; ?>">
|
|
||||||
<a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a>
|
|
||||||
</li>
|
|
||||||
- <li class="item<?php echo Minz_Request::controllerName() === 'update' &&
|
|
||||||
- Minz_Request::actionName() === 'index' ? ' active' : ''; ?>">
|
|
||||||
- <a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a>
|
|
||||||
- </li>
|
|
||||||
<?php } ?>
|
|
||||||
</ul>
|
|
||||||
diff -Naru app-orig/layout/header.phtml app/layout/header.phtml
|
|
||||||
--- app-orig/layout/header.phtml 2016-12-26 15:33:47.000000000 +0000
|
|
||||||
+++ app/layout/header.phtml 2017-02-23 14:48:31.430114487 +0000
|
|
||||||
@@ -71,7 +71,6 @@
|
|
||||||
<li class="item"><a href="<?php echo _url('user', 'manage'); ?>"><?php echo _t('gen.menu.user_management'); ?></a></li>
|
|
||||||
<li class="item"><a href="<?php echo _url('auth', 'index'); ?>"><?php echo _t('gen.menu.authentication'); ?></a></li>
|
|
||||||
<li class="item"><a href="<?php echo _url('update', 'checkInstall'); ?>"><?php echo _t('gen.menu.check_install'); ?></a></li>
|
|
||||||
- <li class="item"><a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('gen.menu.update'); ?></a></li>
|
|
||||||
<?php } ?>
|
|
||||||
<li class="separator"></li>
|
|
||||||
<li class="item"><a href="<?php echo _url('stats', 'index'); ?>"><?php echo _t('gen.menu.stats'); ?></a></li>
|
|
|
@ -1,22 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
$config = include("/app/data/config.php");
|
|
||||||
|
|
||||||
$config["default_user"] = "admin";
|
|
||||||
$config["base_url"] = "https://".getenv('APP_DOMAIN')."/p";
|
|
||||||
$config["db"] = array (
|
|
||||||
"type" => "mysql",
|
|
||||||
"host" => getenv('MYSQL_HOST'),
|
|
||||||
"user" => getenv('MYSQL_USERNAME'),
|
|
||||||
"password" => getenv('MYSQL_PASSWORD'),
|
|
||||||
"base" => getenv('MYSQL_DATABASE'),
|
|
||||||
"prefix" => "",
|
|
||||||
"pdo_options" =>
|
|
||||||
array (
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
$config_str = var_export($config, TRUE);
|
|
||||||
file_put_contents("/app/data/config.php", "<?php return $config_str;");
|
|
||||||
|
|
||||||
?>
|
|
12
start.sh
12
start.sh
|
@ -11,8 +11,8 @@ if ! [ -f /app/data/.installed ]; then
|
||||||
--environment production --default_user admin \
|
--environment production --default_user admin \
|
||||||
--db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
|
--db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
|
||||||
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
|
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
|
||||||
--db-base "${MYSQL_DATABASE}" --db-prefix ""
|
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
|
||||||
php set_config.php # --db-prefix "" seems to be ignored
|
--disable_update
|
||||||
php cli/create-user.php --user admin --password password --language en
|
php cli/create-user.php --user admin --password password --language en
|
||||||
php cli/actualize-user.php --user admin
|
php cli/actualize-user.php --user admin
|
||||||
touch /app/data/.installed
|
touch /app/data/.installed
|
||||||
|
@ -27,8 +27,12 @@ for f in $(ls /app/code/extensions-orig); do
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
echo "Creating config file"
|
echo "Updating config file"
|
||||||
php set_config.php
|
php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}/p" \
|
||||||
|
--db-type mysql --db-host "${MYSQL_HOST}:${MYSQL_PORT}" \
|
||||||
|
--db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
|
||||||
|
--db-base "${MYSQL_DATABASE}" --db-prefix "" \
|
||||||
|
--disable_update
|
||||||
|
|
||||||
|
|
||||||
echo "Setting permissions"
|
echo "Setting permissions"
|
||||||
|
|
Loading…
Reference in New Issue