Skip to content

[Friendica] Update to new source tarball handling #20071

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
Merged
merged 1 commit into from
Oct 10, 2025
Merged

[Friendica] Update to new source tarball handling #20071

merged 1 commit into from
Oct 10, 2025

Conversation

ne20002
Copy link
Contributor

@ne20002 ne20002 commented Oct 10, 2025

Updated the entrypoint-dev.sh to make use of the new single tarball for friendica and its addons.

@ne20002 ne20002 requested a review from a team as a code owner October 10, 2025 09:56
@ne20002 ne20002 changed the title Update to new source tarball handling [Friendica] Update to new source tarball handling Oct 10, 2025
@github-actions GitHub Actions
Copy link

Diff for c216829: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8eaa2a0..e75c56f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -34,15 +34,15 @@ Directory: 2025.02-dev/fpm-alpine
 
 Tags: 2025.07-rc-apache, rc-apache, 2025.07-rc, rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fe4374468345b2ddaedbb075f80b2b810e3ef6af
+GitCommit: 567780fda826aeaf8ec328fd48225f5d6a48e4e8
 Directory: 2025.07-rc/apache
 
 Tags: 2025.07-rc-fpm, rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fe4374468345b2ddaedbb075f80b2b810e3ef6af
+GitCommit: 567780fda826aeaf8ec328fd48225f5d6a48e4e8
 Directory: 2025.07-rc/fpm
 
 Tags: 2025.07-rc-fpm-alpine, rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: fe4374468345b2ddaedbb075f80b2b810e3ef6af
+GitCommit: 567780fda826aeaf8ec328fd48225f5d6a48e4e8
 Directory: 2025.07-rc/fpm-alpine
diff --git a/friendica_rc-fpm-alpine/entrypoint-dev.sh b/friendica_rc-fpm-alpine/entrypoint-dev.sh
index fb56fee..4744060 100755
--- a/friendica_rc-fpm-alpine/entrypoint-dev.sh
+++ b/friendica_rc-fpm-alpine/entrypoint-dev.sh
@@ -3,17 +3,15 @@ set -eu
 
 # just check if we execute apache or php-fpm
 if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
-  curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
-  curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
+  curl -fsSL -o "/usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256"
 
   # Don't download already latest sources
-  if [ -f "/usr/src/friendica.tar.gz.sum256" ] && [ -f "/usr/src/friendica-addons.tar.gz.sum256" ] && \
-    cmp -s "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256" && \
-    cmp -s "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "/usr/src/friendica-addons.tar.gz.sum256"; then
+  if [ -f "/usr/src/friendica.tar.gz.sum256" ] && \
+    cmp -s "/usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256"; then
      echo "Already latest sources - skipped download"
   else
 
-    echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})"
+    echo "Download sources for ${FRIENDICA_VERSION}"
 
     # Removing the previous sources (except config) first
     find /usr/src/friendica -mindepth 1 -maxdepth 1 ! -name 'config' -exec rm -rf {} +
@@ -21,35 +19,24 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287
 
-    curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"
-    curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc";
-    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz
+    curl -fsSL -o friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz"
+    curl -fsSL -o friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc";
+    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz
     echo "Core sources (${FRIENDICA_VERSION}) verified"
 
-    tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
-    rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc
-    cp -an /usr/src/friendica/config/* /usr/src/friendica-full-${FRIENDICA_VERSION}/config/    
+    tar -xzf friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
+    rm friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc
+    cp -an /usr/src/friendica/config/* /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/config/    
     rm -fr /usr/src/friendica
-    mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica
+    mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica
     echo "Core sources (${FRIENDICA_VERSION}) extracted"
 
     chmod 777 /usr/src/friendica/view/smarty3
 
-    curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"
-    curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"
-    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz
-    echo "Addon sources (${FRIENDICA_ADDONS}) verified"
-
-    mkdir -p /usr/src/friendica/addon
-    tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1
-    rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc
-    echo "Addon sources (${FRIENDICA_ADDONS}) extracted"
-
     gpgconf --kill all
     rm -rf "$GNUPGHOME"
 
-    mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256
-    mv -f /usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 /usr/src/friendica-addons.tar.gz.sum256
+    mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256
   fi
 fi
 
diff --git a/friendica_rc-fpm/entrypoint-dev.sh b/friendica_rc-fpm/entrypoint-dev.sh
index fb56fee..4744060 100755
--- a/friendica_rc-fpm/entrypoint-dev.sh
+++ b/friendica_rc-fpm/entrypoint-dev.sh
@@ -3,17 +3,15 @@ set -eu
 
 # just check if we execute apache or php-fpm
 if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
-  curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
-  curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
+  curl -fsSL -o "/usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256"
 
   # Don't download already latest sources
-  if [ -f "/usr/src/friendica.tar.gz.sum256" ] && [ -f "/usr/src/friendica-addons.tar.gz.sum256" ] && \
-    cmp -s "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256" && \
-    cmp -s "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "/usr/src/friendica-addons.tar.gz.sum256"; then
+  if [ -f "/usr/src/friendica.tar.gz.sum256" ] && \
+    cmp -s "/usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256"; then
      echo "Already latest sources - skipped download"
   else
 
-    echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})"
+    echo "Download sources for ${FRIENDICA_VERSION}"
 
     # Removing the previous sources (except config) first
     find /usr/src/friendica -mindepth 1 -maxdepth 1 ! -name 'config' -exec rm -rf {} +
@@ -21,35 +19,24 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287
 
-    curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"
-    curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc";
-    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz
+    curl -fsSL -o friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz"
+    curl -fsSL -o friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc";
+    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz
     echo "Core sources (${FRIENDICA_VERSION}) verified"
 
-    tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
-    rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc
-    cp -an /usr/src/friendica/config/* /usr/src/friendica-full-${FRIENDICA_VERSION}/config/    
+    tar -xzf friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
+    rm friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc
+    cp -an /usr/src/friendica/config/* /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/config/    
     rm -fr /usr/src/friendica
-    mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica
+    mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica
     echo "Core sources (${FRIENDICA_VERSION}) extracted"
 
     chmod 777 /usr/src/friendica/view/smarty3
 
-    curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"
-    curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"
-    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz
-    echo "Addon sources (${FRIENDICA_ADDONS}) verified"
-
-    mkdir -p /usr/src/friendica/addon
-    tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1
-    rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc
-    echo "Addon sources (${FRIENDICA_ADDONS}) extracted"
-
     gpgconf --kill all
     rm -rf "$GNUPGHOME"
 
-    mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256
-    mv -f /usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 /usr/src/friendica-addons.tar.gz.sum256
+    mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256
   fi
 fi
 
diff --git a/friendica_rc/entrypoint-dev.sh b/friendica_rc/entrypoint-dev.sh
index fb56fee..4744060 100755
--- a/friendica_rc/entrypoint-dev.sh
+++ b/friendica_rc/entrypoint-dev.sh
@@ -3,17 +3,15 @@ set -eu
 
 # just check if we execute apache or php-fpm
 if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_UPGRADE:-false}" = "true" ]; then
-  curl -fsSL -o "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256"
-  curl -fsSL -o "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "https://files.friendi.ca/friendica-full-${FRIENDICA_ADDONS}.tar.gz.sum256"
+  curl -fsSL -o "/usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256" "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256"
 
   # Don't download already latest sources
-  if [ -f "/usr/src/friendica.tar.gz.sum256" ] && [ -f "/usr/src/friendica-addons.tar.gz.sum256" ] && \
-    cmp -s "/usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256" && \
-    cmp -s "/usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256" "/usr/src/friendica-addons.tar.gz.sum256"; then
+  if [ -f "/usr/src/friendica.tar.gz.sum256" ] && \
+    cmp -s "/usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256" "/usr/src/friendica.tar.gz.sum256"; then
      echo "Already latest sources - skipped download"
   else
 
-    echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})"
+    echo "Download sources for ${FRIENDICA_VERSION}"
 
     # Removing the previous sources (except config) first
     find /usr/src/friendica -mindepth 1 -maxdepth 1 ! -name 'config' -exec rm -rf {} +
@@ -21,35 +19,24 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287
 
-    curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz"
-    curl -fsSL -o friendica-full-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-full-${FRIENDICA_VERSION}.tar.gz.asc";
-    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-full-${FRIENDICA_VERSION}.tar.gz.asc friendica-full-${FRIENDICA_VERSION}.tar.gz
+    curl -fsSL -o friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz"
+    curl -fsSL -o friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc "https://files.friendi.ca/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc";
+    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz
     echo "Core sources (${FRIENDICA_VERSION}) verified"
 
-    tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
-    rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc
-    cp -an /usr/src/friendica/config/* /usr/src/friendica-full-${FRIENDICA_VERSION}/config/    
+    tar -xzf friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
+    rm friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.asc
+    cp -an /usr/src/friendica/config/* /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/config/    
     rm -fr /usr/src/friendica
-    mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica
+    mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}/ /usr/src/friendica
     echo "Core sources (${FRIENDICA_VERSION}) extracted"
 
     chmod 777 /usr/src/friendica/view/smarty3
 
-    curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz"
-    curl -fsSL -o friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc "https://files.friendi.ca/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc"
-    gpg --batch --logger-fd=1 --no-tty --quiet --verify friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc friendica-addons-${FRIENDICA_ADDONS}.tar.gz
-    echo "Addon sources (${FRIENDICA_ADDONS}) verified"
-
-    mkdir -p /usr/src/friendica/addon
-    tar -xzf friendica-addons-${FRIENDICA_ADDONS}.tar.gz -C /usr/src/friendica/addon --strip-components=1
-    rm friendica-addons-${FRIENDICA_ADDONS}.tar.gz friendica-addons-${FRIENDICA_ADDONS}.tar.gz.asc
-    echo "Addon sources (${FRIENDICA_ADDONS}) extracted"
-
     gpgconf --kill all
     rm -rf "$GNUPGHOME"
 
-    mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256
-    mv -f /usr/src/friendica-addons-${FRIENDICA_ADDONS}.tar.gz.sum256 /usr/src/friendica-addons.tar.gz.sum256
+    mv -f /usr/src/friendica-all-in-one-${FRIENDICA_VERSION}.tar.gz.sum256 /usr/src/friendica.tar.gz.sum256
   fi
 fi

Relevant Maintainers:

tianon
tianon approved these changes Oct 10, 2025
View reviewed changes
Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! That looks like it simplifies the logic quite a lot 👍

@tianon tianon merged commit c45a95c into docker-library:master Oct 10, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tianon tianon tianon approved these changes

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

@ne20002 @tianon