Skip to content

[Friendica] New Version 2026.05#21509

Merged
yosifkit merged 1 commit into
docker-library:masterfrom
ne20002:friendica
May 21, 2026
Merged

[Friendica] New Version 2026.05#21509
yosifkit merged 1 commit into
docker-library:masterfrom
ne20002:friendica

Conversation

@ne20002
Copy link
Copy Markdown
Contributor

@ne20002 ne20002 commented May 21, 2026

The new version 2026.05 of Friendica.
For details see release notes.

@ne20002 ne20002 requested a review from a team as a code owner May 21, 2026 13:42
Copilot AI review requested due to automatic review settings May 21, 2026 13:42

This comment was marked as low quality.

@ne20002
Copy link
Copy Markdown
Contributor Author

ne20002 commented May 21, 2026

It looks to me as if the duplicate tags check is wrong in its finding.

@yosifkit
Copy link
Copy Markdown
Member

It looks to me as if the duplicate tags check is wrong in its finding.

Nope, the tags are duplicated on multiple sets of lines: 7 and 22; 12 and 27; and 17 and 32.

@ne20002
Copy link
Copy Markdown
Contributor Author

ne20002 commented May 21, 2026

My mistake (looked just on the changed lines).

@github-actions
Copy link
Copy Markdown

Diff for 81a30c4:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 63ae3b9..0313203 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,47 +2,47 @@ Maintainers: Friendica <info@friendi.ca> (@friendica), Philipp Holzer <admin@phi
 GitRepo: https://github.com/friendica/docker.git
 GitFetch: refs/heads/stable
 
-Tags: 2026.01-apache, apache, stable-apache, 2026.01, latest, stable
+Tags: 2026.01-apache, 2026.01
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 10607f3b885ca311dcb5c24f57c731ff1857ab14
 Directory: 2026.01/apache
 
-Tags: 2026.01-fpm, fpm, stable-fpm
+Tags: 2026.01-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 10607f3b885ca311dcb5c24f57c731ff1857ab14
 Directory: 2026.01/fpm
 
-Tags: 2026.01-fpm-alpine, fpm-alpine, stable-fpm-alpine
+Tags: 2026.01-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 10607f3b885ca311dcb5c24f57c731ff1857ab14
 Directory: 2026.01/fpm-alpine
 
-Tags: 2026.04-dev-apache, dev-apache, 2026.04-dev, dev
+Tags: 2026.05-apache, apache, stable-apache, 2026.05, latest, stable
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 384247e95a9abf4f26f0bdbccbfc26fdaf0b7d16
-Directory: 2026.04-dev/apache
+GitCommit: b70aa03e49e3c408971417d4d72d1995f857f37a
+Directory: 2026.05/apache
 
-Tags: 2026.04-dev-fpm, dev-fpm
+Tags: 2026.05-fpm, fpm, stable-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 384247e95a9abf4f26f0bdbccbfc26fdaf0b7d16
-Directory: 2026.04-dev/fpm
+GitCommit: b70aa03e49e3c408971417d4d72d1995f857f37a
+Directory: 2026.05/fpm
 
-Tags: 2026.04-dev-fpm-alpine, dev-fpm-alpine
+Tags: 2026.05-fpm-alpine, fpm-alpine, stable-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 384247e95a9abf4f26f0bdbccbfc26fdaf0b7d16
-Directory: 2026.04-dev/fpm-alpine
+GitCommit: b70aa03e49e3c408971417d4d72d1995f857f37a
+Directory: 2026.05/fpm-alpine
 
-Tags: 2026.04-rc-apache, rc-apache, 2026.04-rc, rc
+Tags: 2026.08-dev-apache, dev-apache, 2026.08-dev, dev
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 384247e95a9abf4f26f0bdbccbfc26fdaf0b7d16
-Directory: 2026.04-rc/apache
+GitCommit: dcbc3166d05ca444fa9cdc70247c6e40930a7fce
+Directory: 2026.08-dev/apache
 
-Tags: 2026.04-rc-fpm, rc-fpm
+Tags: 2026.08-dev-fpm, dev-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 384247e95a9abf4f26f0bdbccbfc26fdaf0b7d16
-Directory: 2026.04-rc/fpm
+GitCommit: dcbc3166d05ca444fa9cdc70247c6e40930a7fce
+Directory: 2026.08-dev/fpm
 
-Tags: 2026.04-rc-fpm-alpine, rc-fpm-alpine
+Tags: 2026.08-dev-fpm-alpine, dev-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 384247e95a9abf4f26f0bdbccbfc26fdaf0b7d16
-Directory: 2026.04-rc/fpm-alpine
+GitCommit: dcbc3166d05ca444fa9cdc70247c6e40930a7fce
+Directory: 2026.08-dev/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 38048ca..85d41a0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,14 +2,14 @@ friendica:2026.01
 friendica:2026.01-apache
 friendica:2026.01-fpm
 friendica:2026.01-fpm-alpine
-friendica:2026.04-dev
-friendica:2026.04-dev-apache
-friendica:2026.04-dev-fpm
-friendica:2026.04-dev-fpm-alpine
-friendica:2026.04-rc
-friendica:2026.04-rc-apache
-friendica:2026.04-rc-fpm
-friendica:2026.04-rc-fpm-alpine
+friendica:2026.05
+friendica:2026.05-apache
+friendica:2026.05-fpm
+friendica:2026.05-fpm-alpine
+friendica:2026.08-dev
+friendica:2026.08-dev-apache
+friendica:2026.08-dev-fpm
+friendica:2026.08-dev-fpm-alpine
 friendica:apache
 friendica:dev
 friendica:dev-apache
@@ -18,10 +18,6 @@ friendica:dev-fpm-alpine
 friendica:fpm
 friendica:fpm-alpine
 friendica:latest
-friendica:rc
-friendica:rc-apache
-friendica:rc-fpm
-friendica:rc-fpm-alpine
 friendica:stable
 friendica:stable-apache
 friendica:stable-fpm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 2edd59c..fdae773 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,9 @@
+friendica:2026.01
+friendica:2026.01-fpm
+friendica:2026.01-fpm-alpine
 friendica:dev
 friendica:dev-fpm
 friendica:dev-fpm-alpine
-friendica:rc
-friendica:rc-fpm
-friendica:rc-fpm-alpine
 friendica:stable
 friendica:stable-fpm
 friendica:stable-fpm-alpine
diff --git a/friendica_stable-fpm-alpine/Dockerfile b/friendica_2026.01-fpm-alpine/Dockerfile
similarity index 100%
copy from friendica_stable-fpm-alpine/Dockerfile
copy to friendica_2026.01-fpm-alpine/Dockerfile
diff --git a/friendica_rc-fpm-alpine/config/00apcu.config.php b/friendica_2026.01-fpm-alpine/config/00apcu.config.php
similarity index 100%
rename from friendica_rc-fpm-alpine/config/00apcu.config.php
rename to friendica_2026.01-fpm-alpine/config/00apcu.config.php
diff --git a/friendica_rc-fpm-alpine/config/01redis.config.php b/friendica_2026.01-fpm-alpine/config/01redis.config.php
similarity index 100%
rename from friendica_rc-fpm-alpine/config/01redis.config.php
rename to friendica_2026.01-fpm-alpine/config/01redis.config.php
diff --git a/friendica_rc-fpm-alpine/config/zz-docker.config.php b/friendica_2026.01-fpm-alpine/config/zz-docker.config.php
similarity index 100%
rename from friendica_rc-fpm-alpine/config/zz-docker.config.php
rename to friendica_2026.01-fpm-alpine/config/zz-docker.config.php
diff --git a/friendica_rc-fpm-alpine/cron.sh b/friendica_2026.01-fpm-alpine/cron.sh
similarity index 100%
rename from friendica_rc-fpm-alpine/cron.sh
rename to friendica_2026.01-fpm-alpine/cron.sh
diff --git a/friendica_rc-fpm-alpine/entrypoint.sh b/friendica_2026.01-fpm-alpine/entrypoint.sh
similarity index 100%
rename from friendica_rc-fpm-alpine/entrypoint.sh
rename to friendica_2026.01-fpm-alpine/entrypoint.sh
diff --git a/friendica_rc-fpm-alpine/setup_msmtp.sh b/friendica_2026.01-fpm-alpine/setup_msmtp.sh
similarity index 100%
rename from friendica_rc-fpm-alpine/setup_msmtp.sh
rename to friendica_2026.01-fpm-alpine/setup_msmtp.sh
diff --git a/friendica_rc-fpm-alpine/upgrade.exclude b/friendica_2026.01-fpm-alpine/upgrade.exclude
similarity index 100%
rename from friendica_rc-fpm-alpine/upgrade.exclude
rename to friendica_2026.01-fpm-alpine/upgrade.exclude
diff --git a/friendica_stable-fpm/Dockerfile b/friendica_2026.01-fpm/Dockerfile
similarity index 100%
copy from friendica_stable-fpm/Dockerfile
copy to friendica_2026.01-fpm/Dockerfile
diff --git a/friendica_rc-fpm/config/00apcu.config.php b/friendica_2026.01-fpm/config/00apcu.config.php
similarity index 100%
rename from friendica_rc-fpm/config/00apcu.config.php
rename to friendica_2026.01-fpm/config/00apcu.config.php
diff --git a/friendica_rc-fpm/config/01redis.config.php b/friendica_2026.01-fpm/config/01redis.config.php
similarity index 100%
rename from friendica_rc-fpm/config/01redis.config.php
rename to friendica_2026.01-fpm/config/01redis.config.php
diff --git a/friendica_rc-fpm/config/zz-docker.config.php b/friendica_2026.01-fpm/config/zz-docker.config.php
similarity index 100%
rename from friendica_rc-fpm/config/zz-docker.config.php
rename to friendica_2026.01-fpm/config/zz-docker.config.php
diff --git a/friendica_rc-fpm/cron.sh b/friendica_2026.01-fpm/cron.sh
similarity index 100%
rename from friendica_rc-fpm/cron.sh
rename to friendica_2026.01-fpm/cron.sh
diff --git a/friendica_rc-fpm/entrypoint.sh b/friendica_2026.01-fpm/entrypoint.sh
similarity index 100%
rename from friendica_rc-fpm/entrypoint.sh
rename to friendica_2026.01-fpm/entrypoint.sh
diff --git a/friendica_rc-fpm/setup_msmtp.sh b/friendica_2026.01-fpm/setup_msmtp.sh
similarity index 100%
rename from friendica_rc-fpm/setup_msmtp.sh
rename to friendica_2026.01-fpm/setup_msmtp.sh
diff --git a/friendica_rc-fpm/upgrade.exclude b/friendica_2026.01-fpm/upgrade.exclude
similarity index 100%
rename from friendica_rc-fpm/upgrade.exclude
rename to friendica_2026.01-fpm/upgrade.exclude
diff --git a/friendica_stable/Dockerfile b/friendica_2026.01/Dockerfile
similarity index 100%
copy from friendica_stable/Dockerfile
copy to friendica_2026.01/Dockerfile
diff --git a/friendica_rc/config/00apcu.config.php b/friendica_2026.01/config/00apcu.config.php
similarity index 100%
rename from friendica_rc/config/00apcu.config.php
rename to friendica_2026.01/config/00apcu.config.php
diff --git a/friendica_rc/config/01redis.config.php b/friendica_2026.01/config/01redis.config.php
similarity index 100%
rename from friendica_rc/config/01redis.config.php
rename to friendica_2026.01/config/01redis.config.php
diff --git a/friendica_rc/config/zz-docker.config.php b/friendica_2026.01/config/zz-docker.config.php
similarity index 100%
rename from friendica_rc/config/zz-docker.config.php
rename to friendica_2026.01/config/zz-docker.config.php
diff --git a/friendica_rc/cron.sh b/friendica_2026.01/cron.sh
similarity index 100%
rename from friendica_rc/cron.sh
rename to friendica_2026.01/cron.sh
diff --git a/friendica_rc/entrypoint.sh b/friendica_2026.01/entrypoint.sh
similarity index 100%
rename from friendica_rc/entrypoint.sh
rename to friendica_2026.01/entrypoint.sh
diff --git a/friendica_rc/setup_msmtp.sh b/friendica_2026.01/setup_msmtp.sh
similarity index 100%
rename from friendica_rc/setup_msmtp.sh
rename to friendica_2026.01/setup_msmtp.sh
diff --git a/friendica_rc/upgrade.exclude b/friendica_2026.01/upgrade.exclude
similarity index 100%
rename from friendica_rc/upgrade.exclude
rename to friendica_2026.01/upgrade.exclude
diff --git a/friendica_dev-fpm-alpine/Dockerfile b/friendica_dev-fpm-alpine/Dockerfile
index a3e0860..51f1553 100644
--- a/friendica_dev-fpm-alpine/Dockerfile
+++ b/friendica_dev-fpm-alpine/Dockerfile
@@ -145,7 +145,7 @@ VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS=39
-ENV FRIENDICA_VERSION="2026.04-dev"
+ENV FRIENDICA_VERSION="2026.08-dev"
 
 
 RUN set -ex; \
diff --git a/friendica_dev-fpm/Dockerfile b/friendica_dev-fpm/Dockerfile
index 0f0e49f..bf4bb8e 100644
--- a/friendica_dev-fpm/Dockerfile
+++ b/friendica_dev-fpm/Dockerfile
@@ -167,7 +167,7 @@ VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS=39
-ENV FRIENDICA_VERSION="2026.04-dev"
+ENV FRIENDICA_VERSION="2026.08-dev"
 
 
 RUN set -ex; \
diff --git a/friendica_dev/Dockerfile b/friendica_dev/Dockerfile
index f7f0023..417ab8e 100644
--- a/friendica_dev/Dockerfile
+++ b/friendica_dev/Dockerfile
@@ -175,7 +175,7 @@ VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS=39
-ENV FRIENDICA_VERSION="2026.04-dev"
+ENV FRIENDICA_VERSION="2026.08-dev"
 
 
 RUN set -ex; \
diff --git a/friendica_rc-fpm-alpine/Dockerfile b/friendica_rc-fpm-alpine/Dockerfile
deleted file mode 100644
index ce14fcd..0000000
diff --git a/friendica_rc-fpm-alpine/entrypoint-dev.sh b/friendica_rc-fpm-alpine/entrypoint-dev.sh
deleted file mode 100755
index 4744060..0000000
diff --git a/friendica_rc-fpm/Dockerfile b/friendica_rc-fpm/Dockerfile
deleted file mode 100644
index 2bf9fea..0000000
diff --git a/friendica_rc-fpm/entrypoint-dev.sh b/friendica_rc-fpm/entrypoint-dev.sh
deleted file mode 100755
index 4744060..0000000
diff --git a/friendica_rc/Dockerfile b/friendica_rc/Dockerfile
deleted file mode 100644
index 17bc557..0000000
diff --git a/friendica_rc/entrypoint-dev.sh b/friendica_rc/entrypoint-dev.sh
deleted file mode 100755
index 4744060..0000000
diff --git a/friendica_stable-fpm-alpine/Dockerfile b/friendica_stable-fpm-alpine/Dockerfile
index 94459b4..24b9800 100644
--- a/friendica_stable-fpm-alpine/Dockerfile
+++ b/friendica_stable-fpm-alpine/Dockerfile
@@ -62,6 +62,7 @@ RUN set -ex; \
         icu-dev \
         openldap-dev \
         gmp-dev \
+        gettext \
     ; \
     \
     docker-php-ext-configure gd \
@@ -144,8 +145,8 @@ VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS=39
-ENV FRIENDICA_VERSION="2026.01"
-ENV FRIENDICA_DOWNLOAD_SHA256 "d985715f368e106f070519e1e30240b023f31604b3d9e4cc09f23d4d5150147d"
+ENV FRIENDICA_VERSION="2026.05"
+ENV FRIENDICA_DOWNLOAD_SHA256 "b0a1e218c4a5a30d25b8be5a66cb97a4f4f802b98e7cf3d0d34ce045b2714ab2"
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/friendica_stable-fpm/Dockerfile b/friendica_stable-fpm/Dockerfile
index 5930c30..57732f6 100644
--- a/friendica_stable-fpm/Dockerfile
+++ b/friendica_stable-fpm/Dockerfile
@@ -73,6 +73,7 @@ RUN set -ex; \
         libldap2-dev \
         libgmp-dev \
         libmagickcore-7.q16-10-extra \
+        gettext \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -166,8 +167,8 @@ VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS=39
-ENV FRIENDICA_VERSION="2026.01"
-ENV FRIENDICA_DOWNLOAD_SHA256 "d985715f368e106f070519e1e30240b023f31604b3d9e4cc09f23d4d5150147d"
+ENV FRIENDICA_VERSION="2026.05"
+ENV FRIENDICA_DOWNLOAD_SHA256 "b0a1e218c4a5a30d25b8be5a66cb97a4f4f802b98e7cf3d0d34ce045b2714ab2"
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/friendica_stable/Dockerfile b/friendica_stable/Dockerfile
index 2c13c1c..bc9b7a2 100644
--- a/friendica_stable/Dockerfile
+++ b/friendica_stable/Dockerfile
@@ -73,6 +73,7 @@ RUN set -ex; \
         libldap2-dev \
         libgmp-dev \
         libmagickcore-7.q16-10-extra \
+        gettext \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -174,8 +175,8 @@ VOLUME /var/www/data
 
 # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
 ENV FRIENDICA_SYSLOG_FLAGS=39
-ENV FRIENDICA_VERSION="2026.01"
-ENV FRIENDICA_DOWNLOAD_SHA256 "d985715f368e106f070519e1e30240b023f31604b3d9e4cc09f23d4d5150147d"
+ENV FRIENDICA_VERSION="2026.05"
+ENV FRIENDICA_DOWNLOAD_SHA256 "b0a1e218c4a5a30d25b8be5a66cb97a4f4f802b98e7cf3d0d34ce045b2714ab2"
 
 RUN set -ex; \
     fetchDeps=" \

Relevant Maintainers:

@yosifkit yosifkit merged commit a018681 into docker-library:master May 21, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants