Simpler docker dev env

Note: ._* files are created due to docker file system sync, ignore them

Signed-off-by: Jerome Jutteau <j.jutteau@gmail.com>

diff --git a/.gitignore b/.gitignore
index 00bbc72b285adad155da5ee3c93801fd57b08521..ce9a748b1dbba05e0ff349b2f5fc639b9cedd677 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 lib/config.local.php
 lib/tos.local.txt
 var-*
 lib/config.local.php
 lib/tos.local.txt
 var-*

+*._*

diff --git a/dev.sh b/dev.sh
index 0511c09b0fbd9b6337407b11a09f8c0fa6c6e577..d749cf74b4775cf6b7392cbec021ba04ee97eaaa 100755 (executable)
--- a/dev.sh
+++ b/dev.sh
@@ -1,16 +1,5 @@
 #!/bin/bash
 #!/bin/bash

-set -e
-if [ "$(id -u)" -ne "1000" ]; then
-       echo "your user id is not 1000, shared folder won't have a good uid"
-       exit 1
-fi
+jroot=$(cd "$(dirname $0)" && pwd)

 docker -h &> /dev/null || (echo "You need docker installed" && exit 1)
 docker -h &> /dev/null || (echo "You need docker installed" && exit 1)

-docker pull mojo4242/jirafeau-dev:apache2-php7
-name=jirafeau-dev-$(date +%Y%m%d%H%M%S)
-docker run --name $name -d -p 8000:80 -v $(pwd):/var/www/html mojo4242/jirafeau-dev:apache2-php7 /usr/sbin/apache2ctl -D FOREGROUND
-echo "You can now open http://127.0.0.1:8000/"
-echo "Press enter to destroy instance..."
-read
-docker stop -t 0 $name
-docker rm $name
-echo "Instance destroyed"
+docker pull tutum/apache-php
+docker run -v $jroot:/app  -t -i --rm -p 8080:80 tutum/apache-php