Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Friendica Release 2021.09 | Bugfix again #11061

Merged
merged 1 commit into from
Oct 7, 2021
Merged

Friendica Release 2021.09 | Bugfix again #11061

merged 1 commit into from
Oct 7, 2021

Conversation

nupplaphil
Copy link
Contributor

Once again :-/
This time I forgot a local configuration inside the release artifact which affects the installation process :-/

@github-actions
Copy link

github-actions bot commented Oct 7, 2021

Diff for 969bba4: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0cbdbb0..3253df5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,30 +3,30 @@ GitRepo: https://github.com/friendica/docker.git
 
 Tags: 2021.09-apache, apache, stable-apache, 2021.09, latest, stable
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7881472f579f506458f445ce1db3ce655eb91a5d
+GitCommit: 51dc7021f0f377a425de24ca32738b58f6867e0c
 Directory: 2021.09/apache
 
 Tags: 2021.09-fpm, fpm, stable-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7881472f579f506458f445ce1db3ce655eb91a5d
+GitCommit: 51dc7021f0f377a425de24ca32738b58f6867e0c
 Directory: 2021.09/fpm
 
 Tags: 2021.09-fpm-alpine, fpm-alpine, stable-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7881472f579f506458f445ce1db3ce655eb91a5d
+GitCommit: 51dc7021f0f377a425de24ca32738b58f6867e0c
 Directory: 2021.09/fpm-alpine
 
 Tags: 2021.12-dev-apache, dev-apache, 2021.12-dev, dev
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9fe43ec2fb78aef998f8611834006a026b1e281d
+GitCommit: 8aa05541382295d09f2b4debf5c3d97e233f8599
 Directory: 2021.12-dev/apache
 
 Tags: 2021.12-dev-fpm, dev-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9fe43ec2fb78aef998f8611834006a026b1e281d
+GitCommit: 8aa05541382295d09f2b4debf5c3d97e233f8599
 Directory: 2021.12-dev/fpm
 
 Tags: 2021.12-dev-fpm-alpine, dev-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9fe43ec2fb78aef998f8611834006a026b1e281d
+GitCommit: 8aa05541382295d09f2b4debf5c3d97e233f8599
 Directory: 2021.12-dev/fpm-alpine
diff --git a/friendica_dev-fpm-alpine/Dockerfile b/friendica_dev-fpm-alpine/Dockerfile
index 35bf3a1..5b5d872 100644
--- a/friendica_dev-fpm-alpine/Dockerfile
+++ b/friendica_dev-fpm-alpine/Dockerfile
@@ -78,7 +78,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.20; \
+    pecl install APCu-5.1.21; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
     pecl install imagick-3.5.1; \
diff --git a/friendica_dev-fpm-alpine/entrypoint.sh b/friendica_dev-fpm-alpine/entrypoint.sh
index fa51564..0739dd4 100755
--- a/friendica_dev-fpm-alpine/entrypoint.sh
+++ b/friendica_dev-fpm-alpine/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
 
     # Update docker-based config files, but never delete other config files
-    rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
+    rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/
 
     # In case there is no .htaccess, copy it from the default dist file
     if [ ! -f "/var/www/html/.htaccess" ]; then
@@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
           # load other config files (*.config.php) to the config folder
           if [ -d "/usr/src/config" ]; then
-            rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
+            rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/
           fi
 
           echo "Installation finished"
diff --git a/friendica_dev-fpm/Dockerfile b/friendica_dev-fpm/Dockerfile
index 7fa2145..e4b8327 100644
--- a/friendica_dev-fpm/Dockerfile
+++ b/friendica_dev-fpm/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install apcu-5.1.20; \
+    pecl install apcu-5.1.21; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
     pecl install imagick-3.5.1; \
diff --git a/friendica_dev-fpm/entrypoint.sh b/friendica_dev-fpm/entrypoint.sh
index fa51564..0739dd4 100755
--- a/friendica_dev-fpm/entrypoint.sh
+++ b/friendica_dev-fpm/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
 
     # Update docker-based config files, but never delete other config files
-    rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
+    rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/
 
     # In case there is no .htaccess, copy it from the default dist file
     if [ ! -f "/var/www/html/.htaccess" ]; then
@@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
           # load other config files (*.config.php) to the config folder
           if [ -d "/usr/src/config" ]; then
-            rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
+            rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/
           fi
 
           echo "Installation finished"
diff --git a/friendica_dev/Dockerfile b/friendica_dev/Dockerfile
index bd084b4..9318185 100644
--- a/friendica_dev/Dockerfile
+++ b/friendica_dev/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install apcu-5.1.20; \
+    pecl install apcu-5.1.21; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
     pecl install imagick-3.5.1; \
diff --git a/friendica_dev/entrypoint.sh b/friendica_dev/entrypoint.sh
index fa51564..0739dd4 100755
--- a/friendica_dev/entrypoint.sh
+++ b/friendica_dev/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
 
     # Update docker-based config files, but never delete other config files
-    rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
+    rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/
 
     # In case there is no .htaccess, copy it from the default dist file
     if [ ! -f "/var/www/html/.htaccess" ]; then
@@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
           # load other config files (*.config.php) to the config folder
           if [ -d "/usr/src/config" ]; then
-            rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
+            rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/
           fi
 
           echo "Installation finished"
diff --git a/friendica_stable-fpm-alpine/Dockerfile b/friendica_stable-fpm-alpine/Dockerfile
index 8ddadd6..6b90558 100644
--- a/friendica_stable-fpm-alpine/Dockerfile
+++ b/friendica_stable-fpm-alpine/Dockerfile
@@ -78,7 +78,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.20; \
+    pecl install APCu-5.1.21; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
     pecl install imagick-3.5.1; \
@@ -127,7 +127,7 @@ VOLUME /var/www/html
 
 ENV FRIENDICA_VERSION "2021.09"
 ENV FRIENDICA_ADDONS "2021.09"
-ENV FRIENDICA_DOWNLOAD_SHA256 "49cad34edf1b500b4623d0b92ba32265fe322aac9a3efb08fa234f600bfd817a"
+ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf"
 ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "1910e732b3ca3fc35e57835f217746d6e1fbed1f76d8da1c989742ac2237090d"
 
 RUN set -ex; \
diff --git a/friendica_stable-fpm-alpine/entrypoint.sh b/friendica_stable-fpm-alpine/entrypoint.sh
index fa51564..0739dd4 100755
--- a/friendica_stable-fpm-alpine/entrypoint.sh
+++ b/friendica_stable-fpm-alpine/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
 
     # Update docker-based config files, but never delete other config files
-    rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
+    rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/
 
     # In case there is no .htaccess, copy it from the default dist file
     if [ ! -f "/var/www/html/.htaccess" ]; then
@@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
           # load other config files (*.config.php) to the config folder
           if [ -d "/usr/src/config" ]; then
-            rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
+            rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/
           fi
 
           echo "Installation finished"
diff --git a/friendica_stable-fpm/Dockerfile b/friendica_stable-fpm/Dockerfile
index 5d5cb1b..9f6f1ca 100644
--- a/friendica_stable-fpm/Dockerfile
+++ b/friendica_stable-fpm/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install apcu-5.1.20; \
+    pecl install apcu-5.1.21; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
     pecl install imagick-3.5.1; \
@@ -116,7 +116,7 @@ VOLUME /var/www/html
 
 ENV FRIENDICA_VERSION "2021.09"
 ENV FRIENDICA_ADDONS "2021.09"
-ENV FRIENDICA_DOWNLOAD_SHA256 "49cad34edf1b500b4623d0b92ba32265fe322aac9a3efb08fa234f600bfd817a"
+ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf"
 ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "1910e732b3ca3fc35e57835f217746d6e1fbed1f76d8da1c989742ac2237090d"
 
 RUN set -ex; \
diff --git a/friendica_stable-fpm/entrypoint.sh b/friendica_stable-fpm/entrypoint.sh
index fa51564..0739dd4 100755
--- a/friendica_stable-fpm/entrypoint.sh
+++ b/friendica_stable-fpm/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
 
     # Update docker-based config files, but never delete other config files
-    rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
+    rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/
 
     # In case there is no .htaccess, copy it from the default dist file
     if [ ! -f "/var/www/html/.htaccess" ]; then
@@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
           # load other config files (*.config.php) to the config folder
           if [ -d "/usr/src/config" ]; then
-            rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
+            rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/
           fi
 
           echo "Installation finished"
diff --git a/friendica_stable/Dockerfile b/friendica_stable/Dockerfile
index c75cf18..a8ffc16 100644
--- a/friendica_stable/Dockerfile
+++ b/friendica_stable/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install apcu-5.1.20; \
+    pecl install apcu-5.1.21; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
     pecl install imagick-3.5.1; \
@@ -125,7 +125,7 @@ RUN set -ex;\
 
 ENV FRIENDICA_VERSION "2021.09"
 ENV FRIENDICA_ADDONS "2021.09"
-ENV FRIENDICA_DOWNLOAD_SHA256 "49cad34edf1b500b4623d0b92ba32265fe322aac9a3efb08fa234f600bfd817a"
+ENV FRIENDICA_DOWNLOAD_SHA256 "3f33f5a63c4e9d8ea55b21a33d46663f4b1d636a6546fa3603a244583d3b6faf"
 ENV FRIENDICA_DOWNLOAD_ADDONS_SHA256 "1910e732b3ca3fc35e57835f217746d6e1fbed1f76d8da1c989742ac2237090d"
 
 RUN set -ex; \
diff --git a/friendica_stable/entrypoint.sh b/friendica_stable/entrypoint.sh
index fa51564..0739dd4 100755
--- a/friendica_stable/entrypoint.sh
+++ b/friendica_stable/entrypoint.sh
@@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/
 
     # Update docker-based config files, but never delete other config files
-    rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/
+    rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/
 
     # In case there is no .htaccess, copy it from the default dist file
     if [ ! -f "/var/www/html/.htaccess" ]; then
@@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
 
           # load other config files (*.config.php) to the config folder
           if [ -d "/usr/src/config" ]; then
-            rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/
+            rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/
           fi
 
           echo "Installation finished"

@yosifkit yosifkit merged commit 5c63f96 into docker-library:master Oct 7, 2021
@nupplaphil nupplaphil deleted the friendica branch October 7, 2021 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/friendica
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nupplaphil @yosifkit