Skip to content

Commit 15ecfa9

Browse files
committed
Switch to the module distribution of remi-repo
See remicollet/remirepo#206 (comment)
1 parent 07639cd commit 15ecfa9

File tree

1 file changed

+59
-59
lines changed

1 file changed

+59
-59
lines changed

php-82/cpu-x86.Dockerfile

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM public.ecr.aws/lambda/provided:al2-x86_64 as binary
22

33
# Specifying the exact PHP version lets us avoid the Docker cache when a new version comes out
4-
ENV VERSION_PHP=8.2.0~rc5-18
4+
ENV VERSION_PHP=8.2.0~RC6-7
55
# Check out the latest version available on this page:
66
# https://rpms.remirepo.net/enterprise/7/php82/x86_64/repoview/php-cli.html
77
# See also https://github.com/remicollet/remirepo/issues/206
@@ -28,7 +28,7 @@ RUN yum update -y && yum upgrade -y
2828

2929
# --setopt=skip_missing_names_on_install=False makes sure we get an error if a package is missing
3030
RUN yum install --setopt=skip_missing_names_on_install=False -y \
31-
php82-php-cli-${VERSION_PHP}.el7.remi.x86_64
31+
php-cli-${VERSION_PHP}.el7.remi.x86_64
3232

3333
# These files are included on Amazon Linux 2
3434

@@ -46,7 +46,7 @@ RUN yum install --setopt=skip_missing_names_on_install=False -y \
4646
# RUN cp /lib64/libsmime3.so /bref/lib/libsmime3.so
4747

4848
# PHP Binary
49-
RUN cp /opt/remi/php82/root/usr/bin/php /bref/bin/php && chmod +x /bref/bin/php
49+
RUN cp /usr/bin/php /bref/bin/php && chmod +x /bref/bin/php
5050
RUN cp /lib64/libtinfo.so.5 /bref/lib/libtinfo.so.5
5151
RUN cp /lib64/libedit.so.0 /bref/lib/libedit.so.0
5252
RUN cp /lib64/libncurses.so.5 /bref/lib/libncurses.so.5
@@ -70,17 +70,17 @@ RUN cp /lib64/libncurses.so.5 /bref/lib/libncurses.so.5
7070
#RUN cp /lib64/libpcre.so.1 /bref/lib/libpcre.so.1
7171

7272
# Default Extensions
73-
RUN cp /opt/remi/php82/root/lib64/php/modules/ctype.so /bref/bref/extensions/ctype.so
74-
RUN cp /opt/remi/php82/root/lib64/php/modules/exif.so /bref/bref/extensions/exif.so
75-
RUN cp /opt/remi/php82/root/lib64/php/modules/fileinfo.so /bref/bref/extensions/fileinfo.so
76-
RUN cp /opt/remi/php82/root/lib64/php/modules/ftp.so /bref/bref/extensions/ftp.so
77-
RUN cp /opt/remi/php82/root/lib64/php/modules/gettext.so /bref/bref/extensions/gettext.so
78-
RUN cp /opt/remi/php82/root/lib64/php/modules/iconv.so /bref/bref/extensions/iconv.so
79-
RUN cp /opt/remi/php82/root/lib64/php/modules/sockets.so /bref/bref/extensions/sockets.so
80-
RUN cp /opt/remi/php82/root/lib64/php/modules/tokenizer.so /bref/bref/extensions/tokenizer.so
73+
RUN cp /lib64/php/modules/ctype.so /bref/bref/extensions/ctype.so
74+
RUN cp /lib64/php/modules/exif.so /bref/bref/extensions/exif.so
75+
RUN cp /lib64/php/modules/fileinfo.so /bref/bref/extensions/fileinfo.so
76+
RUN cp /lib64/php/modules/ftp.so /bref/bref/extensions/ftp.so
77+
RUN cp /lib64/php/modules/gettext.so /bref/bref/extensions/gettext.so
78+
RUN cp /lib64/php/modules/iconv.so /bref/bref/extensions/iconv.so
79+
RUN cp /lib64/php/modules/sockets.so /bref/bref/extensions/sockets.so
80+
RUN cp /lib64/php/modules/tokenizer.so /bref/bref/extensions/tokenizer.so
8181

8282
# cURL
83-
RUN cp /opt/remi/php82/root/lib64/php/modules/curl.so /bref/bref/extensions/curl.so
83+
RUN cp /lib64/php/modules/curl.so /bref/bref/extensions/curl.so
8484
#RUN cp /lib64/libcurl.so.4 /bref/lib/libcurl.so.4
8585
#RUN cp /lib64/libnghttp2.so.14 /bref/lib/libnghttp2.so.14
8686
#RUN cp /lib64/libidn2.so.0 /bref/lib/libidn2.so.0
@@ -94,78 +94,78 @@ RUN cp /opt/remi/php82/root/lib64/php/modules/curl.so /bref/bref/extensions/curl
9494

9595
# sodium
9696
# TODO
97-
#RUN cp /opt/remi/php82/root/lib64/php/modules/sodium.so /bref/bref/extensions/sodium.so
97+
#RUN cp /lib64/php/modules/sodium.so /bref/bref/extensions/sodium.so
9898
#RUN cp /usr/lib64/libsodium.so.23 /bref/lib/libsodium.so.23
9999

100100
FROM binary as extensions
101101

102102
RUN yum install -y --setopt=skip_missing_names_on_install=False \
103-
php82-php-mbstring \
104-
php82-php-bcmath \
105-
php82-php-dom \
106-
php82-php-mysqli \
107-
php82-php-mysqlnd \
108-
php82-php-opcache \
109-
php82-php-pdo \
110-
php82-php-pdo_mysql \
111-
php82-php-phar \
112-
php82-php-posix \
113-
php82-php-simplexml \
114-
php82-php-soap \
115-
php82-php-xml \
116-
php82-php-xmlreader \
117-
php82-php-xmlwriter \
118-
php82-php-xsl \
119-
php82-php-intl \
120-
php82-php-apcu \
121-
php82-php-pdo_pgsql \
122-
php82-php-zip
123-
124-
RUN cp /opt/remi/php82/root/lib64/php/modules/mbstring.so /bref/bref/extensions/mbstring.so
103+
php-mbstring \
104+
php-bcmath \
105+
php-dom \
106+
php-mysqli \
107+
php-mysqlnd \
108+
php-opcache \
109+
php-pdo \
110+
php-pdo_mysql \
111+
php-phar \
112+
php-posix \
113+
php-simplexml \
114+
php-soap \
115+
php-xml \
116+
php-xmlreader \
117+
php-xmlwriter \
118+
php-xsl \
119+
php-intl \
120+
php-apcu \
121+
php-pdo_pgsql \
122+
php-zip
123+
124+
RUN cp /lib64/php/modules/mbstring.so /bref/bref/extensions/mbstring.so
125125
RUN cp /usr/lib64/libonig.so.105 /bref/lib/libonig.so.105
126126

127127
# mysqli depends on mysqlnd
128-
RUN cp /opt/remi/php82/root/lib64/php/modules/mysqli.so /bref/bref/extensions/mysqli.so
129-
RUN cp /opt/remi/php82/root/lib64/php/modules/mysqlnd.so /bref/bref/extensions/mysqlnd.so
128+
RUN cp /lib64/php/modules/mysqli.so /bref/bref/extensions/mysqli.so
129+
RUN cp /lib64/php/modules/mysqlnd.so /bref/bref/extensions/mysqlnd.so
130130

131131
#RUN cp /usr/lib64/libsqlite3.so.0 /bref/lib/libsqlite3.so.0
132-
RUN cp /opt/remi/php82/root/lib64/php/modules/sqlite3.so /bref/bref/extensions/sqlite3.so
132+
RUN cp /lib64/php/modules/sqlite3.so /bref/bref/extensions/sqlite3.so
133133

134134
RUN cp /usr/lib64/libgpg-error.so.0 /bref/lib/libgpg-error.so.0
135135
RUN cp /usr/lib64/libgcrypt.so.11 /bref/lib/libgcrypt.so.11
136136
RUN cp /usr/lib64/libexslt.so.0 /bref/lib/libexslt.so.0
137137
RUN cp /usr/lib64/libxslt.so.1 /bref/lib/libxslt.so.1
138-
RUN cp /opt/remi/php82/root/lib64/php/modules/xsl.so /bref/bref/extensions/xsl.so
138+
RUN cp /lib64/php/modules/xsl.so /bref/bref/extensions/xsl.so
139139

140140
RUN cp /usr/lib64/libicuio.so.71 /bref/lib/libicuio.so.71
141141
RUN cp /usr/lib64/libicui18n.so.71 /bref/lib/libicui18n.so.71
142142
RUN cp /usr/lib64/libicuuc.so.71 /bref/lib/libicuuc.so.71
143143
RUN cp /usr/lib64/libicudata.so.71 /bref/lib/libicudata.so.71
144-
RUN cp /opt/remi/php82/root/lib64/php/modules/intl.so /bref/bref/extensions/intl.so
144+
RUN cp /lib64/php/modules/intl.so /bref/bref/extensions/intl.so
145145

146-
RUN cp /opt/remi/php82/root/lib64/php/modules/apcu.so /bref/bref/extensions/apcu.so
146+
RUN cp /lib64/php/modules/apcu.so /bref/bref/extensions/apcu.so
147147

148148
RUN cp /usr/lib64/libpq.so.5 /bref/lib/libpq.so.5
149149
#RUN cp /usr/lib64/libldap_r-2.4.so.2 /bref/lib/libldap_r-2.4.so.2
150-
RUN cp /opt/remi/php82/root/lib64/php/modules/pdo_pgsql.so /bref/bref/extensions/pdo_pgsql.so
150+
RUN cp /lib64/php/modules/pdo_pgsql.so /bref/bref/extensions/pdo_pgsql.so
151151

152152
RUN cp /usr/lib64/libzip.so.5 /bref/lib/libzip.so.5
153153
RUN cp /usr/lib64/libzstd.so.1 /bref/lib/libzstd.so.1
154-
RUN cp /opt/remi/php82/root/lib64/php/modules/zip.so /bref/bref/extensions/zip.so
155-
156-
RUN cp /opt/remi/php82/root/lib64/php/modules/bcmath.so /bref/bref/extensions/bcmath.so
157-
RUN cp /opt/remi/php82/root/lib64/php/modules/dom.so /bref/bref/extensions/dom.so
158-
RUN cp /opt/remi/php82/root/lib64/php/modules/opcache.so /bref/bref/extensions/opcache.so
159-
RUN cp /opt/remi/php82/root/lib64/php/modules/pdo.so /bref/bref/extensions/pdo.so
160-
RUN cp /opt/remi/php82/root/lib64/php/modules/pdo_mysql.so /bref/bref/extensions/pdo_mysql.so
161-
RUN cp /opt/remi/php82/root/lib64/php/modules/pdo_sqlite.so /bref/bref/extensions/pdo_sqlite.so
162-
RUN cp /opt/remi/php82/root/lib64/php/modules/phar.so /bref/bref/extensions/phar.so
163-
RUN cp /opt/remi/php82/root/lib64/php/modules/posix.so /bref/bref/extensions/posix.so
164-
RUN cp /opt/remi/php82/root/lib64/php/modules/simplexml.so /bref/bref/extensions/simplexml.so
165-
RUN cp /opt/remi/php82/root/lib64/php/modules/soap.so /bref/bref/extensions/soap.so
166-
RUN cp /opt/remi/php82/root/lib64/php/modules/xml.so /bref/bref/extensions/xml.so
167-
RUN cp /opt/remi/php82/root/lib64/php/modules/xmlreader.so /bref/bref/extensions/xmlreader.so
168-
RUN cp /opt/remi/php82/root/lib64/php/modules/xmlwriter.so /bref/bref/extensions/xmlwriter.so
154+
RUN cp /lib64/php/modules/zip.so /bref/bref/extensions/zip.so
155+
156+
RUN cp /lib64/php/modules/bcmath.so /bref/bref/extensions/bcmath.so
157+
RUN cp /lib64/php/modules/dom.so /bref/bref/extensions/dom.so
158+
RUN cp /lib64/php/modules/opcache.so /bref/bref/extensions/opcache.so
159+
RUN cp /lib64/php/modules/pdo.so /bref/bref/extensions/pdo.so
160+
RUN cp /lib64/php/modules/pdo_mysql.so /bref/bref/extensions/pdo_mysql.so
161+
RUN cp /lib64/php/modules/pdo_sqlite.so /bref/bref/extensions/pdo_sqlite.so
162+
RUN cp /lib64/php/modules/phar.so /bref/bref/extensions/phar.so
163+
RUN cp /lib64/php/modules/posix.so /bref/bref/extensions/posix.so
164+
RUN cp /lib64/php/modules/simplexml.so /bref/bref/extensions/simplexml.so
165+
RUN cp /lib64/php/modules/soap.so /bref/bref/extensions/soap.so
166+
RUN cp /lib64/php/modules/xml.so /bref/bref/extensions/xml.so
167+
RUN cp /lib64/php/modules/xmlreader.so /bref/bref/extensions/xmlreader.so
168+
RUN cp /lib64/php/modules/xmlwriter.so /bref/bref/extensions/xmlwriter.so
169169

170170
FROM public.ecr.aws/lambda/provided:al2-x86_64 as isolation
171171

@@ -200,11 +200,11 @@ RUN zip --quiet --recurse-paths /tmp/layer.zip .
200200

201201
FROM extensions as fpm-extension
202202

203-
RUN yum install -y php82-php-fpm
203+
RUN yum install -y php-fpm
204204

205205
FROM isolation as fpm
206206

207-
COPY --from=fpm-extension /opt/remi/php82/root/sbin/php-fpm /opt/bin/php-fpm
207+
COPY --from=fpm-extension /sbin/php-fpm /opt/bin/php-fpm
208208

209209
COPY --from=fpm-extension /usr/lib64/libsystemd.so.0 /opt/lib/libsystemd.so.0
210210
COPY --from=fpm-extension /usr/lib64/liblz4.so.1 /opt/lib/liblz4.so.1

0 commit comments

Comments
 (0)