Skip to content

Commit d1aa2b4

Browse files
authored
Merge pull request #699 from mcg-web/fix-docker
Fix docker for php 7.4
2 parents 566fa3f + 9cc72b2 commit d1aa2b4

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

Dockerfile

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,38 @@ COPY composer.json /
55
FROM scratch AS test_source
66

77
COPY benchmarks/ benchmarks/
8-
COPY lib/ /lib/
98
COPY src/ /src/
109
COPY tests/ /tests/
1110
COPY phpunit.xml.* phpstan.neon.* .php_cs.* phpbench.json /
1211

1312
FROM alpine:3.9
1413

14+
ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
15+
16+
RUN apk --update add ca-certificates && \
17+
echo "https://dl.bintray.com/php-alpine/v3.9/php-7.4" >> /etc/apk/repositories
18+
1519
# alpine php package does not include default extensions, be explicit
1620
RUN set -eu; \
1721
apk add --no-cache \
18-
php7 \
19-
php7-iconv \
20-
php7-json \
21-
php7-mbstring \
22-
php7-openssl \
23-
php7-phar \
24-
php7-tokenizer \
25-
php7-xml \
26-
php7-xmlwriter \
27-
php7-dom \
28-
php7-pdo \
29-
;
22+
php \
23+
php-iconv \
24+
php-json \
25+
php-mbstring \
26+
php-openssl \
27+
php-phar \
28+
php-xml \
29+
php-dom \
30+
php-pdo \
31+
; ln -s /usr/bin/php7 /usr/bin/php
3032

3133
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
3234

3335
WORKDIR /opt/test
3436

3537
COPY --from=composer_install_requirements / .
3638

37-
RUN composer install
39+
RUN php7 /usr/bin/composer install
3840

3941
COPY --from=test_source / .
4042

0 commit comments

Comments
 (0)