Skip to content

Commit 6e31cea

Browse files
committed
fixed image building by patching OpenSSL
1 parent 84610be commit 6e31cea

File tree

2 files changed

+2652
-5
lines changed

2 files changed

+2652
-5
lines changed

Dockerfile

+12-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN apk add -U --no-cache \
2323
tar \
2424
xz \
2525
git \
26-
libressl \
26+
openssl \
2727
openssh
2828

2929
# ensure www-data user exists
@@ -64,7 +64,7 @@ RUN set -eux; \
6464
\
6565
mkdir -p /usr/src; \
6666
cd /usr/src; \
67-
\
67+
\
6868
curl -fsSL -o php.tar.xz "$PHP_URL"; \
6969
\
7070
if [ -n "$PHP_SHA256" ]; then \
@@ -93,9 +93,9 @@ RUN set -eux; \
9393
coreutils \
9494
curl-dev \
9595
libedit-dev \
96-
libressl-dev \
9796
libsodium-dev \
9897
libxml2-dev \
98+
openssl-dev \
9999
linux-headers \
100100
libzip-dev \
101101
oniguruma-dev \
@@ -108,8 +108,15 @@ RUN set -eux; \
108108
CPPFLAGS="$PHP_CPPFLAGS" \
109109
LDFLAGS="$PHP_LDFLAGS" \
110110
; \
111-
docker-php-source extract; \
112-
cd /usr/src/php; \
111+
docker-php-source extract
112+
113+
WORKDIR /usr/src/php
114+
115+
RUN apk add patch
116+
117+
COPY files/php-7.4.26-openssl3.patch /usr/src
118+
119+
RUN patch -p1 < ../php-7.4.26-openssl3.patch; \
113120
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
114121
./configure \
115122
--build="$gnuArch" \

0 commit comments

Comments
 (0)