From 9293a887b5f79ef7472da0b7eff1d762b7aa4c25 Mon Sep 17 00:00:00 2001 From: Bryan Latten Date: Wed, 25 Jan 2017 16:15:17 -0500 Subject: [PATCH] =?UTF-8?q?Dockerfile:=20updated=20to=20parent=E2=80=99s?= =?UTF-8?q?=207.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ .travis.yml | 11 +++++++++++ Dockerfile | 2 +- Dockerfile-alpine | 2 +- Dockerfile-edge | 2 +- Dockerfile-legacy | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dd059c3..8550c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ # SASS .sass-cache *.css.map + +# tmp file for upload +tmp.txt diff --git a/.travis.yml b/.travis.yml index 5abf092..37492cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 upload=@tmp.txt localhost:8080 | grep "PHP Version 7.0." +- curl --form upload=@tmp.txt localhost:8081 | grep "PHP Version 7.0." +- curl --form upload=@tmp.txt localhost:8082 | grep "PHP Version 7.1." +- curl --form upload=@tmp.txt localhost:8083 | grep "PHP Version 5.6." - docker-compose kill diff --git a/Dockerfile b/Dockerfile index afc326b..aefcc32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM behance/docker-nginx:6.4 +FROM behance/docker-nginx:7.0 MAINTAINER Bryan Latten # Set TERM to suppress warning messages. diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 23bc410..31de319 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM behance/docker-nginx:6.4-alpine +FROM behance/docker-nginx:7.0-alpine MAINTAINER Bryan Latten # Set TERM to suppress warning messages. diff --git a/Dockerfile-edge b/Dockerfile-edge index d447801..f68d8da 100644 --- a/Dockerfile-edge +++ b/Dockerfile-edge @@ -1,4 +1,4 @@ -FROM behance/docker-nginx:6.4 +FROM behance/docker-nginx:7.0 MAINTAINER Bryan Latten # Set TERM to suppress warning messages. diff --git a/Dockerfile-legacy b/Dockerfile-legacy index 0ed4be3..0cf5d8c 100644 --- a/Dockerfile-legacy +++ b/Dockerfile-legacy @@ -1,4 +1,4 @@ -FROM behance/docker-nginx:6.4 +FROM behance/docker-nginx:7.0 MAINTAINER Bryan Latten # Set TERM to suppress warning messages.