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

release 2.8.5 #18280

Merged
merged 1 commit into from
Jan 21, 2025
Merged

release 2.8.5 #18280

merged 1 commit into from
Jan 21, 2025

Conversation

alcohol
Copy link
Contributor

@alcohol alcohol commented Jan 21, 2025

No description provided.

@alcohol alcohol requested a review from a team as a code owner January 21, 2025 21:14
Copy link

Diff for b42a985:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 17085b8..a873a42 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -5,17 +5,17 @@ Builder: buildkit
 Tags: 1.10.27, 1.10, 1
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitFetch: refs/heads/main
-GitCommit: eb723bde35d03aea01fc23ceef52ee837edc2b5f
+GitCommit: 722eb1639245daf4cf6980d2de8737e204f56384
 Directory: legacy
 
 Tags: 2.2.25, 2.2, lts
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitFetch: refs/heads/main
-GitCommit: 622faef5ee0410dfbd024d410b0e15a67edfd458
+GitCommit: 722eb1639245daf4cf6980d2de8737e204f56384
 Directory: lts
 
-Tags: 2.8.4, 2.8, 2, latest
+Tags: 2.8.5, 2.8, 2, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitFetch: refs/heads/main
-GitCommit: 43d5c71ec3e05cc9c62afba25655d9f6fa0eb30d
+GitCommit: 96b3c5ba320daed850119bdb7834ab17e3f7093d
 Directory: latest
diff --git a/_bashbrew-list b/_bashbrew-list
index 7f250df..c48a9e0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,6 +5,6 @@ composer:2
 composer:2.2
 composer:2.2.25
 composer:2.8
-composer:2.8.4
+composer:2.8.5
 composer:latest
 composer:lts
diff --git a/composer_1/Dockerfile b/composer_1/Dockerfile
index e76f282..0c8bef9 100644
--- a/composer_1/Dockerfile
+++ b/composer_1/Dockerfile
@@ -2,18 +2,18 @@ FROM php:8-alpine AS binary-with-runtime
 
 RUN set -eux ; \
   apk add --no-cache --virtual .composer-rundeps \
+    7zip \
     bash \
     coreutils \
     git \
     make \
+    mercurial \
     openssh-client \
     patch \
     subversion \
     tini \
     unzip \
-    zip \
-    $([ "$(apk --print-arch)" != "x86" ] && echo mercurial) \
-    $([ "$(apk --print-arch)" != "armhf" ] && echo p7zip)
+    zip
 
 RUN printf "# composer php cli ini settings\n\
 date.timezone=UTC\n\
diff --git a/composer_latest/Dockerfile b/composer_latest/Dockerfile
index 51f3e16..ceab3d8 100644
--- a/composer_latest/Dockerfile
+++ b/composer_latest/Dockerfile
@@ -2,18 +2,18 @@ FROM php:8-alpine AS binary-with-runtime
 
 RUN set -eux ; \
   apk add --no-cache --virtual .composer-rundeps \
+    7zip \
     bash \
     coreutils \
     git \
     make \
+    mercurial \
     openssh-client \
     patch \
     subversion \
     tini \
     unzip \
-    zip \
-    $([ "$(apk --print-arch)" != "x86" ] && echo mercurial) \
-    $([ "$(apk --print-arch)" != "armhf" ] && echo p7zip)
+    zip
 
 RUN printf "# composer php cli ini settings\n\
 date.timezone=UTC\n\
@@ -22,7 +22,7 @@ memory_limit=-1\n\
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
 ENV COMPOSER_HOME /tmp
-ENV COMPOSER_VERSION 2.8.4
+ENV COMPOSER_VERSION 2.8.5
 
 RUN set -eux ; \
   # install https://github.com/mlocati/docker-php-extension-installer
diff --git a/composer_lts/Dockerfile b/composer_lts/Dockerfile
index 869207d..7b5eebd 100644
--- a/composer_lts/Dockerfile
+++ b/composer_lts/Dockerfile
@@ -2,18 +2,18 @@ FROM php:8-alpine AS binary-with-runtime
 
 RUN set -eux ; \
   apk add --no-cache --virtual .composer-rundeps \
+    7zip \
     bash \
     coreutils \
     git \
     make \
+    mercurial \
     openssh-client \
     patch \
     subversion \
     tini \
     unzip \
-    zip \
-    $([ "$(apk --print-arch)" != "x86" ] && echo mercurial) \
-    $([ "$(apk --print-arch)" != "armhf" ] && echo p7zip)
+    zip
 
 RUN printf "# composer php cli ini settings\n\
 date.timezone=UTC\n\

Relevant Maintainers:

@yosifkit yosifkit merged commit 2e5f7f8 into docker-library:master Jan 21, 2025
8 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.

2 participants