Skip to content

Commit

Permalink
Fix tests for hhvm and php 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yetanotherape committed Jun 12, 2016
1 parent 0eccf27 commit 45eb171
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/composer.lock
/vendor
15 changes: 15 additions & 0 deletions Dockerfile_5.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM php:5.6-cli

WORKDIR /usr/src/myapp

RUN apt-get update && apt-get install -y \
git \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
COPY composer.json /usr/src/myapp
RUN composer install

COPY . /usr/src/myapp
CMD [ "./vendor/bin/phpunit" ]

# docker build -t diff-match-patch:5.6 -f ./Dockerfile_5.6 .
# docker run -it --rm diff-match-patch:5.6
15 changes: 15 additions & 0 deletions Dockerfile_7.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM php:7.0-cli

WORKDIR /usr/src/myapp

RUN apt-get update && apt-get install -y \
git \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
COPY composer.json /usr/src/myapp
RUN composer install

COPY . /usr/src/myapp
CMD [ "./vendor/bin/phpunit" ]

# docker build -t diff-match-patch:7.0 -f ./Dockerfile_7.0 .
# docker run -it --rm diff-match-patch:7.0
16 changes: 16 additions & 0 deletions Dockerfile_hhvm
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM diegomarangoni/hhvm:cli

WORKDIR /usr/src/myapp

RUN apt-get update && apt-get install -y \
git \
curl \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
COPY composer.json /usr/src/myapp
RUN composer install

COPY . /usr/src/myapp
CMD ["./vendor/bin/phpunit" ]

# docker build -t diff-match-patch:hhvm -f ./Dockerfile_hhvm .
# docker run -it --rm diff-match-patch:hhvm
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lib-iconv": "*"
},
"require-dev": {
"phpunit/phpunit": "3.7.*"
"phpunit/phpunit": "5.*"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 45eb171

Please sign in to comment.