Skip to content

Commit 7c17cfe

Browse files
remicolletphracek
authored andcommitted
check for requested extensions
1 parent ef751eb commit 7c17cfe

File tree

4 files changed

+32
-16
lines changed

4 files changed

+32
-16
lines changed

8.3/Dockerfile.c10s

+8-4
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,19 @@ LABEL summary="${SUMMARY}" \
4141
maintainer="SoftwareCollections.org <[email protected]>"
4242

4343
# Install Apache httpd and PHP
44-
ARG INSTALL_PKGS="php php-fpm php-mysqlnd php-pgsql php-bcmath \
44+
ARG INSTALL_PKGS="php php-fpm mod_ssl hostname"
45+
ARG INSTALL_EXTS="php-json php-mysqli php-pgsql php-bcmath \
4546
php-gd php-intl php-ldap php-mbstring php-pdo \
4647
php-process php-soap php-opcache php-xml \
47-
php-gmp php-apcu php-zip php-redis mod_ssl hostname"
48+
php-gmp php-apcu php-zip php-redis"
4849

49-
RUN dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
50+
RUN dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS $INSTALL_EXTS && \
5051
dnf reinstall -y tzdata && \
5152
rpm -V $INSTALL_PKGS && \
52-
php -v | grep -qe "v$PHP_VERSION\." && echo "Found VERSION $PHP_VERSION" && \
53+
php -v | grep -qe "v$PHP_VERSION\." && \
54+
echo "Found VERSION $PHP_VERSION" && \
55+
for ext in $(echo $INSTALL_EXTS | sed s/php-//g) ; do php -m | grep -qi "$ext\$"; done && \
56+
echo "Found requested extensions" && \
5357
dnf -y clean all --enablerepo='*'
5458

5559
ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \

8.3/Dockerfile.c9s

+8-4
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,20 @@ LABEL summary="${SUMMARY}" \
4141
maintainer="SoftwareCollections.org <[email protected]>"
4242

4343
# Install Apache httpd and PHP
44-
ARG INSTALL_PKGS="php php-fpm php-mysqlnd php-pgsql php-bcmath \
44+
ARG INSTALL_PKGS="php php-fpm mod_ssl hostname"
45+
ARG INSTALL_EXTS="php-json php-mysqli php-pgsql php-bcmath \
4546
php-gd php-intl php-ldap php-mbstring php-pdo \
4647
php-process php-soap php-opcache php-xml \
47-
php-gmp php-apcu php-zip php-redis mod_ssl hostname"
48+
php-gmp php-apcu php-zip php-redis"
4849

4950
RUN dnf module -y enable php:$PHP_VERSION && \
50-
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
51+
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS $INSTALL_EXTS && \
5152
dnf reinstall -y tzdata && \
5253
rpm -V $INSTALL_PKGS && \
53-
php -v | grep -qe "v$PHP_VERSION\." && echo "Found VERSION $PHP_VERSION" && \
54+
php -v | grep -qe "v$PHP_VERSION\." && \
55+
echo "Found VERSION $PHP_VERSION" && \
56+
for ext in $(echo $INSTALL_EXTS | sed s/php-//g) ; do php -m | grep -qi "$ext\$"; done && \
57+
echo "Found requested extensions" && \
5458
dnf -y clean all --enablerepo='*'
5559

5660
ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \

8.3/Dockerfile.fedora

+8-4
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,18 @@ LABEL summary="$SUMMARY" \
3737
maintainer="SoftwareCollections.org <[email protected]>"
3838

3939
# Install Apache httpd and PHP
40-
ARG INSTALL_PKGS="php php-fpm php-mysqlnd php-bcmath \
40+
ARG INSTALL_PKGS="php php-fpm mod_ssl hostname"
41+
ARG INSTALL_EXTS="php-json php-mysqli php-pgsql php-bcmath \
4142
php-gd php-intl php-ldap php-mbstring php-pdo \
4243
php-process php-soap php-opcache php-xml \
43-
php-gmp php-apcu php-zip php-redis mod_ssl hostname"
44+
php-gmp php-apcu php-zip php-redis"
4445

45-
RUN dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS --nogpgcheck && \
46+
RUN dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS $INSTALL_EXTS --nogpgcheck && \
4647
rpm -V $INSTALL_PKGS && \
47-
php -v | grep -qe "v$PHP_VERSION\." && echo "Found VERSION $PHP_VERSION" && \
48+
php -v | grep -qe "v$PHP_VERSION\." && \
49+
echo "Found VERSION $PHP_VERSION" && \
50+
for ext in $(echo $INSTALL_EXTS | sed s/php-//g) ; do php -m | grep -qi "$ext\$"; done && \
51+
echo "Found requested extensions" && \
4852
dnf -y clean all --enablerepo='*'
4953

5054
ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \

8.3/Dockerfile.rhel9

+8-4
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,20 @@ LABEL summary="${SUMMARY}" \
4141
maintainer="SoftwareCollections.org <[email protected]>"
4242

4343
# Install Apache httpd and PHP
44-
ARG INSTALL_PKGS="php php-fpm php-mysqlnd php-pgsql php-bcmath \
44+
ARG INSTALL_PKGS="php php-fpm mod_ssl hostname"
45+
ARG INSTALL_EXTS="php-json php-mysqli php-pgsql php-bcmath \
4546
php-gd php-intl php-ldap php-mbstring php-pdo \
4647
php-process php-soap php-opcache php-xml \
47-
php-gmp php-apcu php-zip php-redis mod_ssl hostname"
48+
php-gmp php-apcu php-zip php-redis"
4849

4950
RUN dnf module -y enable php:$PHP_VERSION && \
50-
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
51+
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS $INSTALL_EXTS && \
5152
dnf reinstall -y tzdata && \
5253
rpm -V $INSTALL_PKGS && \
53-
php -v | grep -qe "v$PHP_VERSION\." && echo "Found VERSION $PHP_VERSION" && \
54+
php -v | grep -qe "v$PHP_VERSION\." && \
55+
echo "Found VERSION $PHP_VERSION" && \
56+
for ext in $(echo $INSTALL_EXTS | sed s/php-//g) ; do php -m | grep -qi "$ext\$"; done && \
57+
echo "Found requested extensions" && \
5458
dnf -y clean all --enablerepo='*'
5559

5660
ENV PHP_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/php/ \

0 commit comments

Comments
 (0)