From 0efa3647e8b4efa2994501c5470345f29faa5bc5 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 21 May 2021 22:21:25 +0200 Subject: [PATCH] Friendica 2021.06 RC --- {2021.03-rc => 2021.06-rc}/apache/Dockerfile | 4 ++-- {2021.03-rc => 2021.06-rc}/apache/config/00apcu.config.php | 0 {2021.03-rc => 2021.06-rc}/apache/config/01redis.config.php | 0 {2021.03-rc => 2021.06-rc}/apache/config/zz-docker.config.php | 0 {2021.03-rc => 2021.06-rc}/apache/cron.sh | 0 {2021.03-rc => 2021.06-rc}/apache/entrypoint-dev.sh | 0 {2021.03-rc => 2021.06-rc}/apache/entrypoint.sh | 0 {2021.03-rc => 2021.06-rc}/apache/setup_msmtp.sh | 0 {2021.03-rc => 2021.06-rc}/apache/upgrade.exclude | 0 {2021.03-rc => 2021.06-rc}/fpm-alpine/Dockerfile | 4 ++-- .../fpm-alpine/config/00apcu.config.php | 0 .../fpm-alpine/config/01redis.config.php | 0 .../fpm-alpine/config/zz-docker.config.php | 0 {2021.03-rc => 2021.06-rc}/fpm-alpine/cron.sh | 0 {2021.03-rc => 2021.06-rc}/fpm-alpine/entrypoint-dev.sh | 0 {2021.03-rc => 2021.06-rc}/fpm-alpine/entrypoint.sh | 0 {2021.03-rc => 2021.06-rc}/fpm-alpine/setup_msmtp.sh | 0 {2021.03-rc => 2021.06-rc}/fpm-alpine/upgrade.exclude | 0 {2021.03-rc => 2021.06-rc}/fpm/Dockerfile | 4 ++-- {2021.03-rc => 2021.06-rc}/fpm/config/00apcu.config.php | 0 {2021.03-rc => 2021.06-rc}/fpm/config/01redis.config.php | 0 {2021.03-rc => 2021.06-rc}/fpm/config/zz-docker.config.php | 0 {2021.03-rc => 2021.06-rc}/fpm/cron.sh | 0 {2021.03-rc => 2021.06-rc}/fpm/entrypoint-dev.sh | 0 {2021.03-rc => 2021.06-rc}/fpm/entrypoint.sh | 0 {2021.03-rc => 2021.06-rc}/fpm/setup_msmtp.sh | 0 {2021.03-rc => 2021.06-rc}/fpm/upgrade.exclude | 0 27 files changed, 6 insertions(+), 6 deletions(-) rename {2021.03-rc => 2021.06-rc}/apache/Dockerfile (98%) rename {2021.03-rc => 2021.06-rc}/apache/config/00apcu.config.php (100%) rename {2021.03-rc => 2021.06-rc}/apache/config/01redis.config.php (100%) rename {2021.03-rc => 2021.06-rc}/apache/config/zz-docker.config.php (100%) rename {2021.03-rc => 2021.06-rc}/apache/cron.sh (100%) rename {2021.03-rc => 2021.06-rc}/apache/entrypoint-dev.sh (100%) rename {2021.03-rc => 2021.06-rc}/apache/entrypoint.sh (100%) rename {2021.03-rc => 2021.06-rc}/apache/setup_msmtp.sh (100%) rename {2021.03-rc => 2021.06-rc}/apache/upgrade.exclude (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/Dockerfile (97%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/config/00apcu.config.php (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/config/01redis.config.php (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/config/zz-docker.config.php (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/cron.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/entrypoint-dev.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/entrypoint.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/setup_msmtp.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm-alpine/upgrade.exclude (100%) rename {2021.03-rc => 2021.06-rc}/fpm/Dockerfile (98%) rename {2021.03-rc => 2021.06-rc}/fpm/config/00apcu.config.php (100%) rename {2021.03-rc => 2021.06-rc}/fpm/config/01redis.config.php (100%) rename {2021.03-rc => 2021.06-rc}/fpm/config/zz-docker.config.php (100%) rename {2021.03-rc => 2021.06-rc}/fpm/cron.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm/entrypoint-dev.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm/entrypoint.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm/setup_msmtp.sh (100%) rename {2021.03-rc => 2021.06-rc}/fpm/upgrade.exclude (100%) diff --git a/2021.03-rc/apache/Dockerfile b/2021.06-rc/apache/Dockerfile similarity index 98% rename from 2021.03-rc/apache/Dockerfile rename to 2021.06-rc/apache/Dockerfile index 8f3d36f..a4e8d56 100644 --- a/2021.03-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 / diff --git a/2021.03-rc/apache/config/00apcu.config.php b/2021.06-rc/apache/config/00apcu.config.php similarity index 100% rename from 2021.03-rc/apache/config/00apcu.config.php rename to 2021.06-rc/apache/config/00apcu.config.php diff --git a/2021.03-rc/apache/config/01redis.config.php b/2021.06-rc/apache/config/01redis.config.php similarity index 100% rename from 2021.03-rc/apache/config/01redis.config.php rename to 2021.06-rc/apache/config/01redis.config.php diff --git a/2021.03-rc/apache/config/zz-docker.config.php b/2021.06-rc/apache/config/zz-docker.config.php similarity index 100% rename from 2021.03-rc/apache/config/zz-docker.config.php rename to 2021.06-rc/apache/config/zz-docker.config.php diff --git a/2021.03-rc/apache/cron.sh b/2021.06-rc/apache/cron.sh similarity index 100% rename from 2021.03-rc/apache/cron.sh rename to 2021.06-rc/apache/cron.sh diff --git a/2021.03-rc/apache/entrypoint-dev.sh b/2021.06-rc/apache/entrypoint-dev.sh similarity index 100% rename from 2021.03-rc/apache/entrypoint-dev.sh rename to 2021.06-rc/apache/entrypoint-dev.sh diff --git a/2021.03-rc/apache/entrypoint.sh b/2021.06-rc/apache/entrypoint.sh similarity index 100% rename from 2021.03-rc/apache/entrypoint.sh rename to 2021.06-rc/apache/entrypoint.sh diff --git a/2021.03-rc/apache/setup_msmtp.sh b/2021.06-rc/apache/setup_msmtp.sh similarity index 100% rename from 2021.03-rc/apache/setup_msmtp.sh rename to 2021.06-rc/apache/setup_msmtp.sh diff --git a/2021.03-rc/apache/upgrade.exclude b/2021.06-rc/apache/upgrade.exclude similarity index 100% rename from 2021.03-rc/apache/upgrade.exclude rename to 2021.06-rc/apache/upgrade.exclude diff --git a/2021.03-rc/fpm-alpine/Dockerfile b/2021.06-rc/fpm-alpine/Dockerfile similarity index 97% rename from 2021.03-rc/fpm-alpine/Dockerfile rename to 2021.06-rc/fpm-alpine/Dockerfile index e9c1f7f..d00af2a 100644 --- a/2021.03-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 / diff --git a/2021.03-rc/fpm-alpine/config/00apcu.config.php b/2021.06-rc/fpm-alpine/config/00apcu.config.php similarity index 100% rename from 2021.03-rc/fpm-alpine/config/00apcu.config.php rename to 2021.06-rc/fpm-alpine/config/00apcu.config.php diff --git a/2021.03-rc/fpm-alpine/config/01redis.config.php b/2021.06-rc/fpm-alpine/config/01redis.config.php similarity index 100% rename from 2021.03-rc/fpm-alpine/config/01redis.config.php rename to 2021.06-rc/fpm-alpine/config/01redis.config.php diff --git a/2021.03-rc/fpm-alpine/config/zz-docker.config.php b/2021.06-rc/fpm-alpine/config/zz-docker.config.php similarity index 100% rename from 2021.03-rc/fpm-alpine/config/zz-docker.config.php rename to 2021.06-rc/fpm-alpine/config/zz-docker.config.php diff --git a/2021.03-rc/fpm-alpine/cron.sh b/2021.06-rc/fpm-alpine/cron.sh similarity index 100% rename from 2021.03-rc/fpm-alpine/cron.sh rename to 2021.06-rc/fpm-alpine/cron.sh diff --git a/2021.03-rc/fpm-alpine/entrypoint-dev.sh b/2021.06-rc/fpm-alpine/entrypoint-dev.sh similarity index 100% rename from 2021.03-rc/fpm-alpine/entrypoint-dev.sh rename to 2021.06-rc/fpm-alpine/entrypoint-dev.sh diff --git a/2021.03-rc/fpm-alpine/entrypoint.sh b/2021.06-rc/fpm-alpine/entrypoint.sh similarity index 100% rename from 2021.03-rc/fpm-alpine/entrypoint.sh rename to 2021.06-rc/fpm-alpine/entrypoint.sh diff --git a/2021.03-rc/fpm-alpine/setup_msmtp.sh b/2021.06-rc/fpm-alpine/setup_msmtp.sh similarity index 100% rename from 2021.03-rc/fpm-alpine/setup_msmtp.sh rename to 2021.06-rc/fpm-alpine/setup_msmtp.sh diff --git a/2021.03-rc/fpm-alpine/upgrade.exclude b/2021.06-rc/fpm-alpine/upgrade.exclude similarity index 100% rename from 2021.03-rc/fpm-alpine/upgrade.exclude rename to 2021.06-rc/fpm-alpine/upgrade.exclude diff --git a/2021.03-rc/fpm/Dockerfile b/2021.06-rc/fpm/Dockerfile similarity index 98% rename from 2021.03-rc/fpm/Dockerfile rename to 2021.06-rc/fpm/Dockerfile index 695fd47..43d2ede 100644 --- a/2021.03-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 / diff --git a/2021.03-rc/fpm/config/00apcu.config.php b/2021.06-rc/fpm/config/00apcu.config.php similarity index 100% rename from 2021.03-rc/fpm/config/00apcu.config.php rename to 2021.06-rc/fpm/config/00apcu.config.php diff --git a/2021.03-rc/fpm/config/01redis.config.php b/2021.06-rc/fpm/config/01redis.config.php similarity index 100% rename from 2021.03-rc/fpm/config/01redis.config.php rename to 2021.06-rc/fpm/config/01redis.config.php diff --git a/2021.03-rc/fpm/config/zz-docker.config.php b/2021.06-rc/fpm/config/zz-docker.config.php similarity index 100% rename from 2021.03-rc/fpm/config/zz-docker.config.php rename to 2021.06-rc/fpm/config/zz-docker.config.php diff --git a/2021.03-rc/fpm/cron.sh b/2021.06-rc/fpm/cron.sh similarity index 100% rename from 2021.03-rc/fpm/cron.sh rename to 2021.06-rc/fpm/cron.sh diff --git a/2021.03-rc/fpm/entrypoint-dev.sh b/2021.06-rc/fpm/entrypoint-dev.sh similarity index 100% rename from 2021.03-rc/fpm/entrypoint-dev.sh rename to 2021.06-rc/fpm/entrypoint-dev.sh diff --git a/2021.03-rc/fpm/entrypoint.sh b/2021.06-rc/fpm/entrypoint.sh similarity index 100% rename from 2021.03-rc/fpm/entrypoint.sh rename to 2021.06-rc/fpm/entrypoint.sh diff --git a/2021.03-rc/fpm/setup_msmtp.sh b/2021.06-rc/fpm/setup_msmtp.sh similarity index 100% rename from 2021.03-rc/fpm/setup_msmtp.sh rename to 2021.06-rc/fpm/setup_msmtp.sh diff --git a/2021.03-rc/fpm/upgrade.exclude b/2021.06-rc/fpm/upgrade.exclude similarity index 100% rename from 2021.03-rc/fpm/upgrade.exclude rename to 2021.06-rc/fpm/upgrade.exclude