Skip to content

Commit

Permalink
Dockerfile: updated to parent’s 7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryan Latten committed Jan 25, 2017
1 parent 1be238f commit 9293a88
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@
# SASS
.sass-cache
*.css.map

# tmp file for upload
tmp.txt
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ before_install:
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin

# - Build and run all variants
# - Ensure text from phpinfo is present in default response
# - Create a 98MB tmp file
# - Upload file to each variant
# - Ensure text from phpinfo is present in response to upload, which is returned for everything
# ---- mainly to check /tmp permission issues from nginx
script:
- docker-compose build ubuntu
- docker-compose build edge
Expand All @@ -24,4 +30,9 @@ script:
- curl localhost:8081 | grep "PHP Version 7.0."
- curl localhost:8082 | grep "PHP Version 7.1."
- curl localhost:8083 | grep "PHP Version 5.6."
- dd if=/dev/zero of=tmp.txt count=100000 bs=1024
- curl --form [email protected] localhost:8080 | grep "PHP Version 7.0."
- curl --form [email protected] localhost:8081 | grep "PHP Version 7.0."
- curl --form [email protected] localhost:8082 | grep "PHP Version 7.1."
- curl --form [email protected] localhost:8083 | grep "PHP Version 5.6."
- docker-compose kill
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM behance/docker-nginx:6.4
FROM behance/docker-nginx:7.0
MAINTAINER Bryan Latten <[email protected]>

# Set TERM to suppress warning messages.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM behance/docker-nginx:6.4-alpine
FROM behance/docker-nginx:7.0-alpine
MAINTAINER Bryan Latten <[email protected]>

# Set TERM to suppress warning messages.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-edge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM behance/docker-nginx:6.4
FROM behance/docker-nginx:7.0
MAINTAINER Bryan Latten <[email protected]>

# Set TERM to suppress warning messages.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-legacy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM behance/docker-nginx:6.4
FROM behance/docker-nginx:7.0
MAINTAINER Bryan Latten <[email protected]>

# Set TERM to suppress warning messages.
Expand Down

0 comments on commit 9293a88

Please sign in to comment.