Skip to content

Commit 99c5143

Browse files
authored
Revert "Install PHP8.0 instead php8.0-dev (#340)"
This reverts commit 90b27e3.
1 parent 57d2942 commit 99c5143

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

runtimes/7.4/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN apt-get update \
2121
&& apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \
2222
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu impish main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2323
&& apt-get update \
24-
&& apt-get install -y php7.4-cli php7.4 \
24+
&& apt-get install -y php7.4-cli php7.4-dev \
2525
php7.4-pgsql php7.4-sqlite3 php7.4-gd \
2626
php7.4-curl php7.4-memcached \
2727
php7.4-imap php7.4-mysql php7.4-mbstring \

runtimes/8.0/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN apt-get update \
2121
&& apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \
2222
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu impish main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2323
&& apt-get update \
24-
&& apt-get install -y php8.0-cli php8.0 \
24+
&& apt-get install -y php8.0-cli php8.0-dev \
2525
php8.0-pgsql php8.0-sqlite3 php8.0-gd \
2626
php8.0-curl php8.0-memcached \
2727
php8.0-imap php8.0-mysql php8.0-mbstring \
@@ -43,6 +43,8 @@ RUN apt-get update \
4343
&& apt-get clean \
4444
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
4545

46+
RUN update-alternatives --set php /usr/bin/php8.0
47+
4648
RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.0
4749

4850
RUN groupadd --force -g $WWWGROUP sail

runtimes/8.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN apt-get update \
2121
&& apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \
2222
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu impish main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
2323
&& apt-get update \
24-
&& apt-get install -y php8.1-cli php8.1 \
24+
&& apt-get install -y php8.1-cli php8.1-dev \
2525
php8.1-pgsql php8.1-sqlite3 php8.1-gd \
2626
php8.1-curl \
2727
php8.1-imap php8.1-mysql php8.1-mbstring \

0 commit comments

Comments
 (0)