Merge pull request #94 from bryanlatten/build-run-tests

Dockerfile: using upstream AUFS bug workaround

Author: bryanlatten

Dockerfile

@@ -108,5 +108,6 @@ RUN phpenmod overrides && \
     # Set nginx to listen on defined port \
     sed -i "s/listen [0-9]*;/listen ${CONTAINER_PORT};/" $CONF_NGINX_SITE
 
-RUN goss -g goss.ubuntu.yaml validate
+RUN goss -g /tests/php-fpm/ubuntu.goss.yaml validate && \
+    /tmp/aufs_hack.sh
 

Dockerfile-alpine

@@ -135,4 +135,5 @@ COPY ./container/root /
 RUN cp /etc/php/7.0/mods-available/* $CONF_PHPMODS && \
     rm $CONF_PHPMODS/00_opcache.ini
 
-RUN goss -g goss.alpine.yaml validate
+RUN goss -g /tests/php-fpm/alpine.goss.yaml validate && \
+    /tmp/aufs_hack.sh

Dockerfile-edge

@@ -117,4 +117,5 @@ RUN cp /etc/php/7.0/mods-available/* $CONF_PHPMODS && \
     # Set nginx to listen on defined port \
     sed -i "s/listen [0-9]*;/listen ${CONTAINER_PORT};/" $CONF_NGINX_SITE
 
-RUN goss -g goss.beta.yaml validate
+RUN goss -g /tests/php-fpm/beta.goss.yaml validate && \
+    /tmp/aufs_hack.sh

container/root/app/public/index.php

@@ -8,3 +8,16 @@
 fwrite( $stderr, 'Using STDERR pipe for output' );
 
 phpinfo();
+
+// Use the below form to test uploads
+?>
+
+<form method="post" action="/" enctype="multipart/form-data">
+  <p>
+  Please specify a file, or a set of files:<br>
+  <input type="file" name="datafile">
+  </p>
+  <div>
+  <input type="submit" value="Send">
+  </div>
+</form>

container/root/clean.sh

@@ -24,4 +24,4 @@ apt-get autoclean -y && \
 apt-get autoremove -y && \
 rm -rf /var/lib/{cache,log}/ && \
 rm -rf /var/lib/apt/lists/ && \
-rm -rf /tmp/* /var/tmp/*
+rm -rf /var/tmp/*

container/root/goss.alpine.yaml …iner/root/tests/php-fpm/alpine.goss.yamlcontainer/root/goss.alpine.yaml renamed to container/root/tests/php-fpm/alpine.goss.yaml container/root/goss.alpine.yaml renamed to container/root/tests/php-fpm/alpine.goss.yaml

@@ -1,5 +1,5 @@
 gossfile:
-  goss.base.yaml: {}
+  base.goss.yaml: {}
 
 package:
   php7:

container/root/goss.base.yaml …tainer/root/tests/php-fpm/base.goss.yamlcontainer/root/goss.base.yaml renamed to container/root/tests/php-fpm/base.goss.yaml container/root/goss.base.yaml renamed to container/root/tests/php-fpm/base.goss.yaml

@@ -1,3 +1,6 @@
+gossfile:
+  ../../goss.nginx.yaml: {}
+
 group:
   www-data:
     exists: true

container/root/goss.beta.yaml …tainer/root/tests/php-fpm/beta.goss.yamlcontainer/root/goss.beta.yaml renamed to container/root/tests/php-fpm/beta.goss.yaml container/root/goss.beta.yaml renamed to container/root/tests/php-fpm/beta.goss.yaml

@@ -1,6 +1,6 @@
 # Note: base cannot be used because versions are different
 # gossfile:
-#   goss.base.yaml: {}
+#   base.goss.yaml: {}
 group:
   www-data:
     exists: true

container/root/goss.ubuntu.yaml …iner/root/tests/php-fpm/ubuntu.goss.yamlcontainer/root/goss.ubuntu.yaml renamed to container/root/tests/php-fpm/ubuntu.goss.yaml container/root/goss.ubuntu.yaml renamed to container/root/tests/php-fpm/ubuntu.goss.yaml

@@ -1,5 +1,5 @@
 gossfile:
-  goss.base.yaml: {}
+  base.goss.yaml: {}
 
 package:
   php7.0:

docker-compose.yml

@@ -15,8 +15,8 @@ ubuntu:
     S6_KILL_GRACETIME: 1
   volumes:
    - ./container/root/app:/app
-   - ./container/root/goss.base.yaml:/goss.base.yaml
-   - ./container/root/goss.ubuntu.yaml:/goss.ubuntu.yaml
+   - ./container/root/tests/php-fpm/base.goss.yaml:/tests/php-fpm/base.goss.yaml
+   - ./container/root/tests/php-fpm/ubuntu.goss.yaml:/tests/php-fpm/ubuntu.goss.yaml
 alpine:
   build: .
   dockerfile: Dockerfile-alpine
@@ -35,8 +35,8 @@ alpine:
     S6_KILL_GRACETIME: 1
   volumes:
    - ./container/root/app:/app
-   - ./container/root/goss.base.yaml:/goss.base.yaml
-   - ./container/root/goss.alpine.yaml:/goss.alpine.yaml
+   - ./container/root/tests/php-fpm/base.goss.yaml:/tests/php-fpm/base.goss.yaml
+   - ./container/root/tests/php-fpm/alpine.goss.yaml:/tests/php-fpm/alpine.goss.yaml
 edge:
   build: .
   dockerfile: Dockerfile-edge
@@ -55,5 +55,5 @@ edge:
     S6_KILL_GRACETIME: 1
   volumes:
    - ./container/root/app:/app
-   - ./container/root/goss.base.yaml:/goss.base.yaml
-   - ./container/root/goss.beta.yaml:/goss.beta.yaml
+   - ./container/root/tests/php-fpm/base.goss.yaml:/tests/php-fpm/base.goss.yaml
+   - ./container/root/tests/php-fpm/beta.goss.yaml:/tests/php-fpm/beta.goss.yaml