Skip to content

Commit f886224

Browse files
committed
fix build
1 parent 3f1d32c commit f886224

File tree

3 files changed

+343
-580
lines changed

3 files changed

+343
-580
lines changed

Dockerfile

+10-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
FROM hexletbasics/base-image
22

3-
ARG PHP_VERSION='8.1'
4-
5-
RUN add-apt-repository ppa:ondrej/php
63
RUN apt-get update && \
74
apt-get install -yqq \
8-
php${PHP_VERSION} \
9-
php${PHP_VERSION}-common \
10-
php${PHP_VERSION}-opcache \
11-
php${PHP_VERSION}-cli \
12-
php${PHP_VERSION}-gd \
13-
php${PHP_VERSION}-curl \
14-
php${PHP_VERSION}-mbstring \
15-
php${PHP_VERSION}-xml
5+
php \
6+
php-common \
7+
php-cli \
8+
php-gd \
9+
php-curl \
10+
php-mbstring \
11+
php-xml
1612

1713
ENV COMPOSER_NO_INTERACTION 1
1814
ENV COMPOSER_ALLOW_SUPERUSER 1
@@ -27,8 +23,9 @@ WORKDIR /exercises-php
2723
RUN mkdir -p /usr/local/etc/php/conf.d/
2824
RUN echo "include_path = \".:/exercises-php\"" > /usr/local/etc/php/conf.d/code-basics.ini
2925

30-
COPY . .
31-
26+
COPY composer.json composer.lock .
3227
RUN composer install
3328

29+
COPY . .
30+
3431
ENV PATH=/exercises-php/bin:$PATH

composer.json

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"squizlabs/php_codesniffer": "^3.5.4"
3+
"squizlabs/php_codesniffer": "^3.7"
44
},
55
"autoload": {
66
"psr-4": {"HexletBasics\\": "src/"},
@@ -11,9 +11,15 @@
1111
"scripts": {
1212
},
1313
"require-dev": {
14-
"symfony/var-dumper": "^6.1",
14+
"symfony/var-dumper": "^7.2",
1515
"codedungeon/phpunit-result-printer": "^0.32.0",
16-
"phpunit/phpunit": "9.5.16",
17-
"ngyuki/phpower": "dev-master"
18-
}
16+
"phpunit/phpunit": "^9.5.16",
17+
"ngyuki/phpower": "dev-php83"
18+
},
19+
"repositories": [
20+
{
21+
"type": "vcs",
22+
"url": "https://github.com/fey/phpower"
23+
}
24+
]
1925
}

0 commit comments

Comments
 (0)