Skip to content

Commit 7511178

Browse files
committed
Use PHP 8.1
1 parent be869e8 commit 7511178

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

Dockerfile

+24-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:buster-slim as base
1+
FROM debian:bullseye-slim as dev
22
MAINTAINER JM Leroux <[email protected]>
33

44
ENV DEBIAN_FRONTEND noninteractive
@@ -16,31 +16,32 @@ RUN echo 'APT::Install-Recommends "0" ; APT::Install-Suggests "0" ;' > /etc/apt/
1616
unzip \
1717
wget
1818

19-
RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg &&\
20-
sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' &&\
21-
apt-get update && \
22-
apt-get --yes install \
23-
php7.4-cli \
24-
php7.4-opcache \
25-
php7.4-xml \
26-
php7.4-curl \
27-
php7.4-mbstring \
28-
php7.4-bcmath \
29-
php7.4-apcu \
30-
php7.4-zip && \
31-
apt-get clean && rm -rf /var/lib/apt/lists/*
19+
RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
20+
&& sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
21+
&& apt update \
22+
&& apt --yes install \
23+
php8.1-cli \
24+
php8.1-opcache \
25+
php8.1-xml \
26+
php8.1-curl \
27+
php8.1-mbstring \
28+
php8.1-bcmath \
29+
php8.1-apcu \
30+
php8.1-zip \
31+
php8.1-xdebug \
32+
&& apt-get clean && rm -rf /var/lib/apt/lists/*
3233

3334
# Configure PHP CLI
34-
COPY docker/jmleroux.ini /etc/php/7.4/mods-available/jmleroux.ini
35+
COPY docker/jmleroux.ini /etc/php/8.1/mods-available/jmleroux.ini
3536
RUN phpenmod jmleroux
3637

37-
FROM base as dev
38+
RUN useradd docker --shell /bin/bash --create-home \
39+
&& usermod --append --groups sudo docker \
40+
&& echo 'ALL ALL = (ALL) NOPASSWD: ALL' >> /etc/sudoers \
41+
&& echo 'docker:secret' | chpasswd
3842

39-
RUN apt-get update && \
40-
apt-get --yes install \
41-
php7.4-xdebug && \
42-
apt-get clean && rm -rf /var/lib/apt/lists/*
43-
44-
# Install composer
45-
COPY --from=composer:2.0 /usr/bin/composer /usr/local/bin/composer
43+
COPY --from=composer:2.4 /usr/bin/composer /usr/local/bin/composer
4644
RUN chmod +x /usr/local/bin/composer
45+
46+
USER docker
47+
WORKDIR /home/docker/

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
build:
66
context: .
77
target: dev
8-
image: circleci-php-client:php-7.4
8+
image: circleci-php-client:php-8.1
99
environment:
1010
COMPOSER_HOME: /home/docker/.composer
1111
PHP_IDE_CONFIG: 'serverName=circleci-api-client'

0 commit comments

Comments
 (0)