Skip to content

Commit 722eb16

Browse files
jnoordsijalcohol
authored andcommitted
Update installed Alpine packages
- Replace p7zip with 7zip - Install 7zip and mercurial on all architectures
1 parent 622faef commit 722eb16

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

latest/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ FROM php:8-alpine AS binary-with-runtime
22

33
RUN set -eux ; \
44
apk add --no-cache --virtual .composer-rundeps \
5+
7zip \
56
bash \
67
coreutils \
78
git \
89
make \
10+
mercurial \
911
openssh-client \
1012
patch \
1113
subversion \
1214
tini \
1315
unzip \
14-
zip \
15-
$([ "$(apk --print-arch)" != "x86" ] && echo mercurial) \
16-
$([ "$(apk --print-arch)" != "armhf" ] && echo p7zip)
16+
zip
1717

1818
RUN printf "# composer php cli ini settings\n\
1919
date.timezone=UTC\n\

legacy/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ FROM php:8-alpine AS binary-with-runtime
22

33
RUN set -eux ; \
44
apk add --no-cache --virtual .composer-rundeps \
5+
7zip \
56
bash \
67
coreutils \
78
git \
89
make \
10+
mercurial \
911
openssh-client \
1012
patch \
1113
subversion \
1214
tini \
1315
unzip \
14-
zip \
15-
$([ "$(apk --print-arch)" != "x86" ] && echo mercurial) \
16-
$([ "$(apk --print-arch)" != "armhf" ] && echo p7zip)
16+
zip
1717

1818
RUN printf "# composer php cli ini settings\n\
1919
date.timezone=UTC\n\

lts/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ FROM php:8-alpine AS binary-with-runtime
22

33
RUN set -eux ; \
44
apk add --no-cache --virtual .composer-rundeps \
5+
7zip \
56
bash \
67
coreutils \
78
git \
89
make \
10+
mercurial \
911
openssh-client \
1012
patch \
1113
subversion \
1214
tini \
1315
unzip \
14-
zip \
15-
$([ "$(apk --print-arch)" != "x86" ] && echo mercurial) \
16-
$([ "$(apk --print-arch)" != "armhf" ] && echo p7zip)
16+
zip
1717

1818
RUN printf "# composer php cli ini settings\n\
1919
date.timezone=UTC\n\

0 commit comments

Comments
 (0)