Friendica 2021.06 RC

2021-05-21 22:21:25 +02:00 · 2021-05-21 22:21:25 +02:00 · 0efa3647e8
commit 0efa3647e8
--- a/2021.06-rc/apache/Dockerfile
+++ b/2021.06-rc/apache/Dockerfile
@ -132,8 +132,8 @@ RUN set -ex;\
    } > /etc/apache2/conf-available/remoteip.conf;\
    a2enconf remoteip

-ENV FRIENDICA_VERSION "2021.03-rc"
-ENV FRIENDICA_ADDONS "2021.03-rc"
+ENV FRIENDICA_VERSION "2021.06-rc"
+ENV FRIENDICA_ADDONS "2021.06-rc"


 COPY *.sh upgrade.exclude /
--- a/2021.06-rc/apache/config/00apcu.config.php
+++ b/2021.06-rc/apache/config/00apcu.config.php
--- a/2021.06-rc/apache/config/01redis.config.php
+++ b/2021.06-rc/apache/config/01redis.config.php
--- a/2021.06-rc/apache/config/zz-docker.config.php
+++ b/2021.06-rc/apache/config/zz-docker.config.php
--- a/2021.06-rc/apache/cron.sh
+++ b/2021.06-rc/apache/cron.sh
--- a/2021.06-rc/apache/entrypoint-dev.sh
+++ b/2021.06-rc/apache/entrypoint-dev.sh
--- a/2021.06-rc/apache/entrypoint.sh
+++ b/2021.06-rc/apache/entrypoint.sh
--- a/2021.06-rc/apache/setup_msmtp.sh
+++ b/2021.06-rc/apache/setup_msmtp.sh
--- a/2021.06-rc/apache/upgrade.exclude
+++ b/2021.06-rc/apache/upgrade.exclude
--- a/2021.06-rc/fpm-alpine/Dockerfile
+++ b/2021.06-rc/fpm-alpine/Dockerfile
@ -98,8 +98,8 @@ RUN set -ex; \
 VOLUME /var/www/html


-ENV FRIENDICA_VERSION "2021.03-rc"
-ENV FRIENDICA_ADDONS "2021.03-rc"
+ENV FRIENDICA_VERSION "2021.06-rc"
+ENV FRIENDICA_ADDONS "2021.06-rc"


 COPY *.sh upgrade.exclude /
--- a/2021.06-rc/fpm-alpine/config/00apcu.config.php
+++ b/2021.06-rc/fpm-alpine/config/00apcu.config.php
--- a/2021.06-rc/fpm-alpine/config/01redis.config.php
+++ b/2021.06-rc/fpm-alpine/config/01redis.config.php
--- a/2021.06-rc/fpm-alpine/config/zz-docker.config.php
+++ b/2021.06-rc/fpm-alpine/config/zz-docker.config.php
--- a/2021.06-rc/fpm-alpine/cron.sh
+++ b/2021.06-rc/fpm-alpine/cron.sh
--- a/2021.06-rc/fpm-alpine/entrypoint-dev.sh
+++ b/2021.06-rc/fpm-alpine/entrypoint-dev.sh
--- a/2021.06-rc/fpm-alpine/entrypoint.sh
+++ b/2021.06-rc/fpm-alpine/entrypoint.sh
--- a/2021.06-rc/fpm-alpine/setup_msmtp.sh
+++ b/2021.06-rc/fpm-alpine/setup_msmtp.sh
--- a/2021.06-rc/fpm-alpine/upgrade.exclude
+++ b/2021.06-rc/fpm-alpine/upgrade.exclude
--- a/2021.06-rc/fpm/Dockerfile
+++ b/2021.06-rc/fpm/Dockerfile
@ -123,8 +123,8 @@ RUN set -ex; \
 VOLUME /var/www/html


-ENV FRIENDICA_VERSION "2021.03-rc"
-ENV FRIENDICA_ADDONS "2021.03-rc"
+ENV FRIENDICA_VERSION "2021.06-rc"
+ENV FRIENDICA_ADDONS "2021.06-rc"


 COPY *.sh upgrade.exclude /
--- a/2021.06-rc/fpm/config/00apcu.config.php
+++ b/2021.06-rc/fpm/config/00apcu.config.php
--- a/2021.06-rc/fpm/config/01redis.config.php
+++ b/2021.06-rc/fpm/config/01redis.config.php
--- a/2021.06-rc/fpm/config/zz-docker.config.php
+++ b/2021.06-rc/fpm/config/zz-docker.config.php
--- a/2021.06-rc/fpm/cron.sh
+++ b/2021.06-rc/fpm/cron.sh
--- a/2021.06-rc/fpm/entrypoint-dev.sh
+++ b/2021.06-rc/fpm/entrypoint-dev.sh
--- a/2021.06-rc/fpm/entrypoint.sh
+++ b/2021.06-rc/fpm/entrypoint.sh
--- a/2021.06-rc/fpm/setup_msmtp.sh
+++ b/2021.06-rc/fpm/setup_msmtp.sh
--- a/2021.06-rc/fpm/upgrade.exclude
+++ b/2021.06-rc/fpm/upgrade.exclude