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.

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

[Friendica] update 2024.09-dev #17422

Merged
merged 1 commit into from
Aug 26, 2024

Conversation

ne20002
Copy link
Contributor

@ne20002 ne20002 commented Aug 24, 2024

update 2024.09-dev to

  • bookworm
  • php 8.2

- bookworm
- php 8.2
@ne20002 ne20002 requested a review from a team as a code owner August 24, 2024 07:15
Copy link

Diff for 5a6bee5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8f543dc..b54a590 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -34,15 +34,15 @@ Directory: 2024.08/fpm-alpine
 
 Tags: 2024.09-dev-apache, dev-apache, 2024.09-dev, dev
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f7d6119f1ac8d5a3d944fd5de39c23cba7125a7f
+GitCommit: 69adf85d8791b5b149476ca7e434c17a19192767
 Directory: 2024.09-dev/apache
 
 Tags: 2024.09-dev-fpm, dev-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f7d6119f1ac8d5a3d944fd5de39c23cba7125a7f
+GitCommit: 69adf85d8791b5b149476ca7e434c17a19192767
 Directory: 2024.09-dev/fpm
 
 Tags: 2024.09-dev-fpm-alpine, dev-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f7d6119f1ac8d5a3d944fd5de39c23cba7125a7f
+GitCommit: 69adf85d8791b5b149476ca7e434c17a19192767
 Directory: 2024.09-dev/fpm-alpine
diff --git a/friendica_dev-fpm-alpine/Dockerfile b/friendica_dev-fpm-alpine/Dockerfile
index 2da4c94..aa129b3 100644
--- a/friendica_dev-fpm-alpine/Dockerfile
+++ b/friendica_dev-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.1-fpm-alpine
+FROM php:8.2-fpm-alpine
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/friendica_dev-fpm/Dockerfile b/friendica_dev-fpm/Dockerfile
index 1adab74..fb504b8 100644
--- a/friendica_dev-fpm/Dockerfile
+++ b/friendica_dev-fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.1-fpm-bullseye
+FROM php:8.2-fpm-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -63,6 +63,8 @@ RUN set -ex; \
         libtool \
         libmagick++-dev \
         libmemcached-dev \
+        zlib1g-dev \
+        libssl-dev \
         libgraphicsmagick1-dev \
         libfreetype6-dev \
         libwebp-dev \
diff --git a/friendica_dev/Dockerfile b/friendica_dev/Dockerfile
index cceaabc..7e44870 100644
--- a/friendica_dev/Dockerfile
+++ b/friendica_dev/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.1-apache-bullseye
+FROM php:8.2-apache-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -63,6 +63,8 @@ RUN set -ex; \
         libtool \
         libmagick++-dev \
         libmemcached-dev \
+        zlib1g-dev \
+        libssl-dev \
         libgraphicsmagick1-dev \
         libfreetype6-dev \
         libwebp-dev \

Relevant Maintainers:

@yosifkit yosifkit merged commit 035e6c1 into docker-library:master Aug 26, 2024
14 checks passed
@ne20002 ne20002 deleted the friendica/2024.09-dev branch August 26, 2024 19:37
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.

2 participants