Merge pull request #222 from nupplaphil/2023.01

Friendica Hotfix 2023.01
2024-12-29 12:52:11 +01:00 · 2023-01-15 13:04:45 +01:00 · 2023-01-15 13:04:45 +01:00 · 99934c2ecc
commit 99934c2ecc
parent ae57c5c2f5 cadef0d220
26 changed files with 14 additions and 14 deletions
--- a/2023.01/apache/Dockerfile
+++ b/2023.01/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 "2022.12"
-ENV FRIENDICA_ADDONS "2022.12"
-ENV FRIENDICA_DOWNLOAD_SHA256 "05c6b8152314dc45fd2e574994b531e7f1e1509a70dc56cd78bf1e3c07227092"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "feff1548f01431bd3822372a6c228c872d70e2831c0877b248aae66e1ded8315"
+ENV FRIENDICA_VERSION "2023.01"
+ENV FRIENDICA_ADDONS "2023.01"
+ENV FRIENDICA_DOWNLOAD_SHA256 "4496990805142d20051a5273904a47809ae12f1cadd74de305d5ae167b7cdf6e"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "48117926a6ffeb58aaf81795cfbd5ad24acf76693744e92817593e310acc5262"

 RUN set -ex; \
    fetchDeps=" \
--- a/2023.01/apache/config/00apcu.config.php
+++ b/2023.01/apache/config/00apcu.config.php
--- a/2023.01/apache/config/01redis.config.php
+++ b/2023.01/apache/config/01redis.config.php
--- a/2023.01/apache/config/zz-docker.config.php
+++ b/2023.01/apache/config/zz-docker.config.php
--- a/2023.01/apache/cron.sh
+++ b/2023.01/apache/cron.sh
--- a/2023.01/apache/entrypoint.sh
+++ b/2023.01/apache/entrypoint.sh
--- a/2023.01/apache/setup_msmtp.sh
+++ b/2023.01/apache/setup_msmtp.sh
--- a/2023.01/apache/upgrade.exclude
+++ b/2023.01/apache/upgrade.exclude
--- a/2023.01/fpm-alpine/Dockerfile
+++ b/2023.01/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 "2022.12"
-ENV FRIENDICA_ADDONS "2022.12"
-ENV FRIENDICA_DOWNLOAD_SHA256 "05c6b8152314dc45fd2e574994b531e7f1e1509a70dc56cd78bf1e3c07227092"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "feff1548f01431bd3822372a6c228c872d70e2831c0877b248aae66e1ded8315"
+ENV FRIENDICA_VERSION "2023.01"
+ENV FRIENDICA_ADDONS "2023.01"
+ENV FRIENDICA_DOWNLOAD_SHA256 "4496990805142d20051a5273904a47809ae12f1cadd74de305d5ae167b7cdf6e"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "48117926a6ffeb58aaf81795cfbd5ad24acf76693744e92817593e310acc5262"

 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
--- a/2023.01/fpm-alpine/config/00apcu.config.php
+++ b/2023.01/fpm-alpine/config/00apcu.config.php
--- a/2023.01/fpm-alpine/config/01redis.config.php
+++ b/2023.01/fpm-alpine/config/01redis.config.php
--- a/2023.01/fpm-alpine/config/zz-docker.config.php
+++ b/2023.01/fpm-alpine/config/zz-docker.config.php
--- a/2023.01/fpm-alpine/cron.sh
+++ b/2023.01/fpm-alpine/cron.sh
--- a/2023.01/fpm-alpine/entrypoint.sh
+++ b/2023.01/fpm-alpine/entrypoint.sh
--- a/2023.01/fpm-alpine/setup_msmtp.sh
+++ b/2023.01/fpm-alpine/setup_msmtp.sh
--- a/2023.01/fpm-alpine/upgrade.exclude
+++ b/2023.01/fpm-alpine/upgrade.exclude
--- a/2023.01/fpm/Dockerfile
+++ b/2023.01/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 "2022.12"
-ENV FRIENDICA_ADDONS "2022.12"
-ENV FRIENDICA_DOWNLOAD_SHA256 "05c6b8152314dc45fd2e574994b531e7f1e1509a70dc56cd78bf1e3c07227092"
-ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "feff1548f01431bd3822372a6c228c872d70e2831c0877b248aae66e1ded8315"
+ENV FRIENDICA_VERSION "2023.01"
+ENV FRIENDICA_ADDONS "2023.01"
+ENV FRIENDICA_DOWNLOAD_SHA256 "4496990805142d20051a5273904a47809ae12f1cadd74de305d5ae167b7cdf6e"
+ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "48117926a6ffeb58aaf81795cfbd5ad24acf76693744e92817593e310acc5262"

 RUN set -ex; \
    fetchDeps=" \
--- a/2023.01/fpm/config/00apcu.config.php
+++ b/2023.01/fpm/config/00apcu.config.php
--- a/2023.01/fpm/config/01redis.config.php
+++ b/2023.01/fpm/config/01redis.config.php
--- a/2023.01/fpm/config/zz-docker.config.php
+++ b/2023.01/fpm/config/zz-docker.config.php
--- a/2023.01/fpm/cron.sh
+++ b/2023.01/fpm/cron.sh
--- a/2023.01/fpm/entrypoint.sh
+++ b/2023.01/fpm/entrypoint.sh
--- a/2023.01/fpm/setup_msmtp.sh
+++ b/2023.01/fpm/setup_msmtp.sh
--- a/2023.01/fpm/upgrade.exclude
+++ b/2023.01/fpm/upgrade.exclude
--- a/latest.txt
+++ b/latest.txt
@ -1 +1 @@
-2022.12
+2023.01
--- a/update.sh
+++ b/update.sh
@ -94,7 +94,7 @@ variants=(
  fpm-alpine
 )

-min_version='2022.12'
+min_version='2023.01'

 # version_greater_or_equal A B returns whether A >= B
 function version_greater_or_equal() {
 @ -1 +1 @@
 .12
 .01