Merge pull request #230 from nupplaphil/release

Release 2023.05
friendica · May 23, 2023 · 3291f3e · 3291f3e
2 parents 50bf32a + cf6182c
commit 3291f3e
Show file tree

Hide file tree

Showing 81 changed files with 21 additions and 1,617 deletions.
diff --git a/2023.05-rc/apache/Dockerfile b/2023.05-rc/apache/Dockerfile
diff --git a/2023.04/apache/Dockerfile → 2023.05/apache/Dockerfile b/2023.04/apache/Dockerfile → 2023.05/apache/Dockerfile
@@ -165,10 +165,10 @@ RUN set -ex;\
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2023.04-1"
-ENV FRIENDICA_ADDONS "2023.04-1"
-ENV FRIENDICA_DOWNLOAD_SHA256 "10871f5bf48b637222e16d06bd65da8708532b3c92a99ef07545624ce2cf5e05"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "9209781ca51489cb6c7cd8aae5a62aa82cfbb94198353840e668ee885045a2e9"
+ENV FRIENDICA_VERSION "2023.05"
+ENV FRIENDICA_ADDONS "2023.05"
+ENV FRIENDICA_DOWNLOAD_SHA256 "333e63c0aaea24a072c21393de3a1ac5b66e6cb25158db668417b842bedcdee7"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "6b6f486532a995f67bf6bc0d459ee371a2bfd2ba9b95c84dac49193cdfe76ea8"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/2023.04/apache/config/00apcu.config.php → 2023.05/apache/config/00apcu.config.php b/2023.04/apache/config/00apcu.config.php → 2023.05/apache/config/00apcu.config.php
diff --git a/2023.04/apache/config/01redis.config.php → 2023.05/apache/config/01redis.config.php b/2023.04/apache/config/01redis.config.php → 2023.05/apache/config/01redis.config.php
diff --git a/2023.04/apache/config/zz-docker.config.php → 2023.05/apache/config/zz-docker.config.php b/2023.04/apache/config/zz-docker.config.php → 2023.05/apache/config/zz-docker.config.php
diff --git a/2023.04/apache/cron.sh → 2023.05/apache/cron.sh b/2023.04/apache/cron.sh → 2023.05/apache/cron.sh
diff --git a/2023.04/apache/entrypoint.sh → 2023.05/apache/entrypoint.sh b/2023.04/apache/entrypoint.sh → 2023.05/apache/entrypoint.sh
diff --git a/2023.04/apache/setup_msmtp.sh → 2023.05/apache/setup_msmtp.sh b/2023.04/apache/setup_msmtp.sh → 2023.05/apache/setup_msmtp.sh
diff --git a/2023.04/apache/upgrade.exclude → 2023.05/apache/upgrade.exclude b/2023.04/apache/upgrade.exclude → 2023.05/apache/upgrade.exclude
diff --git a/2023.04/fpm-alpine/Dockerfile → 2023.05/fpm-alpine/Dockerfile b/2023.04/fpm-alpine/Dockerfile → 2023.05/fpm-alpine/Dockerfile
@@ -137,10 +137,10 @@ VOLUME /var/www/html
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2023.04-1"
-ENV FRIENDICA_ADDONS "2023.04-1"
-ENV FRIENDICA_DOWNLOAD_SHA256 "10871f5bf48b637222e16d06bd65da8708532b3c92a99ef07545624ce2cf5e05"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "9209781ca51489cb6c7cd8aae5a62aa82cfbb94198353840e668ee885045a2e9"
+ENV FRIENDICA_VERSION "2023.05"
+ENV FRIENDICA_ADDONS "2023.05"
+ENV FRIENDICA_DOWNLOAD_SHA256 "333e63c0aaea24a072c21393de3a1ac5b66e6cb25158db668417b842bedcdee7"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "6b6f486532a995f67bf6bc0d459ee371a2bfd2ba9b95c84dac49193cdfe76ea8"
 
 RUN set -ex; \
      apk add --no-cache --virtual .fetch-deps \

diff --git a/2023.04/fpm-alpine/config/00apcu.config.php → 2023.05/fpm-alpine/config/00apcu.config.php b/2023.04/fpm-alpine/config/00apcu.config.php → 2023.05/fpm-alpine/config/00apcu.config.php
diff --git a/2023.04/fpm-alpine/config/01redis.config.php → 2023.05/fpm-alpine/config/01redis.config.php b/2023.04/fpm-alpine/config/01redis.config.php → 2023.05/fpm-alpine/config/01redis.config.php
diff --git a/...04/fpm-alpine/config/zz-docker.config.php → ...05/fpm-alpine/config/zz-docker.config.php b/...04/fpm-alpine/config/zz-docker.config.php → ...05/fpm-alpine/config/zz-docker.config.php
diff --git a/2023.04/fpm-alpine/cron.sh → 2023.05/fpm-alpine/cron.sh b/2023.04/fpm-alpine/cron.sh → 2023.05/fpm-alpine/cron.sh
diff --git a/2023.04/fpm-alpine/entrypoint.sh → 2023.05/fpm-alpine/entrypoint.sh b/2023.04/fpm-alpine/entrypoint.sh → 2023.05/fpm-alpine/entrypoint.sh
diff --git a/2023.04/fpm-alpine/setup_msmtp.sh → 2023.05/fpm-alpine/setup_msmtp.sh b/2023.04/fpm-alpine/setup_msmtp.sh → 2023.05/fpm-alpine/setup_msmtp.sh
diff --git a/2023.04/fpm-alpine/upgrade.exclude → 2023.05/fpm-alpine/upgrade.exclude b/2023.04/fpm-alpine/upgrade.exclude → 2023.05/fpm-alpine/upgrade.exclude
diff --git a/2023.04/fpm/Dockerfile → 2023.05/fpm/Dockerfile b/2023.04/fpm/Dockerfile → 2023.05/fpm/Dockerfile
@@ -156,10 +156,10 @@ VOLUME /var/www/html
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS 39
-ENV FRIENDICA_VERSION "2023.04-1"
-ENV FRIENDICA_ADDONS "2023.04-1"
-ENV FRIENDICA_DOWNLOAD_SHA256 "10871f5bf48b637222e16d06bd65da8708532b3c92a99ef07545624ce2cf5e05"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "9209781ca51489cb6c7cd8aae5a62aa82cfbb94198353840e668ee885045a2e9"
+ENV FRIENDICA_VERSION "2023.05"
+ENV FRIENDICA_ADDONS "2023.05"
+ENV FRIENDICA_DOWNLOAD_SHA256 "333e63c0aaea24a072c21393de3a1ac5b66e6cb25158db668417b842bedcdee7"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "6b6f486532a995f67bf6bc0d459ee371a2bfd2ba9b95c84dac49193cdfe76ea8"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/2023.04/fpm/config/00apcu.config.php → 2023.05/fpm/config/00apcu.config.php b/2023.04/fpm/config/00apcu.config.php → 2023.05/fpm/config/00apcu.config.php
diff --git a/2023.04/fpm/config/01redis.config.php → 2023.05/fpm/config/01redis.config.php b/2023.04/fpm/config/01redis.config.php → 2023.05/fpm/config/01redis.config.php
diff --git a/2023.04/fpm/config/zz-docker.config.php → 2023.05/fpm/config/zz-docker.config.php b/2023.04/fpm/config/zz-docker.config.php → 2023.05/fpm/config/zz-docker.config.php
diff --git a/2023.04/fpm/cron.sh → 2023.05/fpm/cron.sh b/2023.04/fpm/cron.sh → 2023.05/fpm/cron.sh
diff --git a/2023.04/fpm/entrypoint.sh → 2023.05/fpm/entrypoint.sh b/2023.04/fpm/entrypoint.sh → 2023.05/fpm/entrypoint.sh
diff --git a/2023.04/fpm/setup_msmtp.sh → 2023.05/fpm/setup_msmtp.sh b/2023.04/fpm/setup_msmtp.sh → 2023.05/fpm/setup_msmtp.sh
diff --git a/2023.04/fpm/upgrade.exclude → 2023.05/fpm/upgrade.exclude b/2023.04/fpm/upgrade.exclude → 2023.05/fpm/upgrade.exclude
diff --git a/2023.06-dev/apache/config/00apcu.config.php b/2023.06-dev/apache/config/00apcu.config.php
diff --git a/2023.06-dev/apache/config/01redis.config.php b/2023.06-dev/apache/config/01redis.config.php
diff --git a/2023.06-dev/apache/config/zz-docker.config.php b/2023.06-dev/apache/config/zz-docker.config.php
diff --git a/2023.06-dev/apache/cron.sh b/2023.06-dev/apache/cron.sh
diff --git a/2023.06-dev/apache/entrypoint-dev.sh b/2023.06-dev/apache/entrypoint-dev.sh