Skip to content

Commit 15cda0b

Browse files
author
Jonathan Gaillard
committed
Merge pull request #29 from nubs/master
Switch to use nubs/phpunit base docker image.
2 parents aafb20e + 417e3cc commit 15cda0b

3 files changed

Lines changed: 11 additions & 20 deletions

File tree

tests/Dockerfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
FROM base/archlinux
1+
FROM nubs/phpunit
2+
3+
USER root
24

35
RUN pacman --sync --refresh --noconfirm --noprogressbar --quiet
4-
RUN pacman --sync --noconfirm --noprogressbar --quiet php xdebug php-mongo git openssh
6+
RUN pacman --sync --noconfirm --noprogressbar --quiet php-mongo
57

6-
ADD provisioning/php/php-extensions.ini /etc/php/conf.d/extensions.ini
7-
ADD provisioning/php/xdebug.ini /etc/php/conf.d/xdebug.ini
8-
ADD provisioning/set-env.sh /set-env.sh
8+
# Get around a bug with docker registry where the owner is root for the home
9+
# user. See https://github.com/docker/docker/issues/5892.
10+
RUN chown -R build /home/build
911

10-
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
12+
USER build
1113

12-
VOLUME ["/code"]
13-
WORKDIR /code
14+
ADD provisioning/set-env.sh /home/build/set-env.sh
1415

15-
ENTRYPOINT ["/set-env.sh"]
16-
CMD ["/code/build.php"]
16+
ENTRYPOINT ["/home/build/set-env.sh"]
17+
CMD ["./build.php"]

tests/provisioning/php/php-extensions.ini

Lines changed: 0 additions & 9 deletions
This file was deleted.

tests/provisioning/php/xdebug.ini

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)