Skip to content

Commit 75999d3

Browse files
adobe-shruthiadobe-shruthi
committed
Merge branch 'develop' into MCLOUD-13771
2 parents 18ac591 + 3b9f1ad commit 75999d3

File tree

12 files changed

+26
-32
lines changed

12 files changed

+26
-32
lines changed

‎images/mailhog/1.0/Dockerfile‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22
# MailHog Dockerfile
33
#
44

5-
FROM golang:1.17.9-alpine
5+
FROM golang:1.24-alpine
66

7-
# Install MailHog:
8-
RUN apk --no-cache add --virtual build-dependencies \
9-
git \
10-
&& mkdir -p /root/gocode \
11-
&& export GOPATH=/root/gocode \
12-
&& go get github.com/mailhog/MailHog@v1.0.1 \
13-
&& mv /root/gocode/bin/MailHog /usr/local/bin \
14-
&& rm -rf /root/gocode \
15-
&& apk del --purge build-dependencies
7+
# Install MailHog
8+
RUN apk --no-cache add git \
9+
&& go install github.com/mailhog/MailHog@v1.0.1 \
10+
&& mv /go/bin/MailHog /usr/local/bin/MailHog \
11+
&& apk del git
1612

1713
# Add mailhog user/group with uid/gid 1000.
1814
# This is a workaround for boot2docker issue #581, see

‎images/php/8.1-cli/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ RUN apt-get update \
5656
gnupg2 \
5757
ca-certificates \
5858
lsb-release \
59-
software-properties-common \
6059
libbz2-dev \
6160
libjpeg62-turbo-dev \
6261
libpng-dev \
@@ -65,7 +64,7 @@ RUN apt-get update \
6564
libgpgme11-dev \
6665
libicu-dev \
6766
libldap2-dev \
68-
libpcre3-dev \
67+
libpcre2-dev \
6968
libpspell-dev \
7069
libtidy-dev \
7170
libxslt1-dev \

‎images/php/8.1-fpm/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ RUN apt-get update \
3737
gnupg2 \
3838
ca-certificates \
3939
lsb-release \
40-
software-properties-common \
4140
libbz2-dev \
4241
libjpeg62-turbo-dev \
4342
libpng-dev \
@@ -46,7 +45,7 @@ RUN apt-get update \
4645
libgpgme11-dev \
4746
libicu-dev \
4847
libldap2-dev \
49-
libpcre3-dev \
48+
libpcre2-dev \
5049
libpspell-dev \
5150
libtidy-dev \
5251
libxslt1-dev \

‎images/php/8.2-cli/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ RUN apt-get update \
5656
gnupg2 \
5757
ca-certificates \
5858
lsb-release \
59-
software-properties-common \
6059
libbz2-dev \
6160
libjpeg62-turbo-dev \
6261
libpng-dev \
@@ -65,7 +64,7 @@ RUN apt-get update \
6564
libgpgme11-dev \
6665
libicu-dev \
6766
libldap2-dev \
68-
libpcre3-dev \
67+
libpcre2-dev \
6968
libpspell-dev \
7069
libtidy-dev \
7170
libxslt1-dev \

‎images/php/8.2-fpm/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ RUN apt-get update \
3737
gnupg2 \
3838
ca-certificates \
3939
lsb-release \
40-
software-properties-common \
4140
libbz2-dev \
4241
libjpeg62-turbo-dev \
4342
libpng-dev \
@@ -46,7 +45,7 @@ RUN apt-get update \
4645
libgpgme11-dev \
4746
libicu-dev \
4847
libldap2-dev \
49-
libpcre3-dev \
48+
libpcre2-dev \
5049
libpspell-dev \
5150
libtidy-dev \
5251
libxslt1-dev \

‎images/php/8.3-cli/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ RUN apt-get update \
5656
gnupg2 \
5757
ca-certificates \
5858
lsb-release \
59-
software-properties-common \
6059
libbz2-dev \
6160
libjpeg62-turbo-dev \
6261
libpng-dev \
@@ -65,7 +64,7 @@ RUN apt-get update \
6564
libgpgme11-dev \
6665
libicu-dev \
6766
libldap2-dev \
68-
libpcre3-dev \
67+
libpcre2-dev \
6968
libpspell-dev \
7069
libtidy-dev \
7170
libxslt1-dev \

‎images/php/8.3-fpm/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ RUN apt-get update \
3737
gnupg2 \
3838
ca-certificates \
3939
lsb-release \
40-
software-properties-common \
4140
libbz2-dev \
4241
libjpeg62-turbo-dev \
4342
libpng-dev \
@@ -46,7 +45,7 @@ RUN apt-get update \
4645
libgpgme11-dev \
4746
libicu-dev \
4847
libldap2-dev \
49-
libpcre3-dev \
48+
libpcre2-dev \
5049
libpspell-dev \
5150
libtidy-dev \
5251
libxslt1-dev \

‎images/php/8.4-cli/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ RUN apt-get update \
7777
gnupg2 \
7878
ca-certificates \
7979
lsb-release \
80-
software-properties-common \
8180
libbz2-dev \
8281
libjpeg62-turbo-dev \
8382
libpng-dev \
@@ -86,7 +85,7 @@ RUN apt-get update \
8685
libgpgme11-dev \
8786
libicu-dev \
8887
libldap2-dev \
89-
libpcre3-dev \
88+
libpcre2-dev \
9089
libpspell-dev \
9190
libtidy-dev \
9291
libxslt1-dev \

‎images/php/8.4-fpm/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ RUN apt-get update \
5858
gnupg2 \
5959
ca-certificates \
6060
lsb-release \
61-
software-properties-common \
6261
libbz2-dev \
6362
libjpeg62-turbo-dev \
6463
libpng-dev \
@@ -67,7 +66,7 @@ RUN apt-get update \
6766
libgpgme11-dev \
6867
libicu-dev \
6968
libldap2-dev \
70-
libpcre3-dev \
69+
libpcre2-dev \
7170
libpspell-dev \
7271
libtidy-dev \
7372
libxslt1-dev \

‎tests/functional/Codeception/Docker.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ public function runDockerComposeCommand(string $command): bool
108108
public function resetFilesOwner(): bool
109109
{
110110
return $this->runDockerComposeCommand(
111-
'run build bash -c "chown -R $(id -u):$(id -g) . /composer/cache"'
112-
);
111+
'run --user root build bash -c "uid=$(stat -c %u . 2>/dev/null || stat -f %u .); gid=$(stat -c %g . 2>/dev/null || stat -f %g .); chown -R $uid:$gid . /composer/cache"'
112+
);
113113
}
114114

115115
/**

0 commit comments

Comments
 (0)