Merge pull request #366 from WyriHaximusNet/add-docker-in-dev-image

Add Docker to dev image

Author: WyriHaximus

Dockerfile-nts-alpine

@@ -121,6 +121,7 @@ RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; th
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
+RUN apk add --no-cache docker && addgroup app docker
 
 ENTRYPOINT ["docker-php-entrypoint"]
 
@@ -140,6 +141,7 @@ RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; th
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
+RUN apk add --no-cache docker && addgroup app docker
 
 ENTRYPOINT ["docker-php-entrypoint"]
 

Dockerfile-zts-alpine

@@ -122,6 +122,7 @@ RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; th
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
+RUN apk add --no-cache docker && addgroup app docker
 
 ENTRYPOINT ["docker-php-entrypoint"]
 
@@ -137,6 +138,7 @@ RUN if [ $(php -v | grep "alpha\|ALPHA\|beta\|BETA\|rc\|RC" | wc -l) != 0 ] ; th
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
+RUN apk add --no-cache docker && addgroup app docker
 
 ENTRYPOINT ["docker-php-entrypoint"]
 

test/container/testn_docker.py

@@ -0,0 +1,8 @@
+import pytest
+
+@pytest.mark.php_dev
+def test_docker_is_available(host):
+    output = host.run('docker')
+    assert u'Docker version ' in output.stdout
+    assert output.stderr == ''
+    assert output.rc == 0