WIP tidying filetree

Former-commit-id: 5b6480537b

Dockerfile

@@ -1,7 +1,7 @@
 FROM wordpress:latest
 
 RUN touch /var/log/apache2/php_err.log && chown www-data:www-data /var/log/apache2/php_err.log
-COPY php_error.ini /usr/local/etc/php/conf.d/php_error.ini
+COPY provisioning/php_error.ini /usr/local/etc/php/conf.d/php_error.ini
 
 RUN apt-get update \
 && apt-get install -y inotify-tools rsync mysql-client \
@@ -11,5 +11,5 @@ RUN apt-get update \
 RUN curl -L https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -o /usr/local/bin/wp
 RUN chmod +x /usr/local/bin/wp
 
-COPY *.sh /
+COPY provisioning/*.sh /
 

circle.yml

@@ -10,5 +10,5 @@ test:
     - docker run --name plugindevwp --link devmysql:mysql -p 8080:80 -d -v $(pwd):/app leonstafford/wordpress-static-html-plugin
     - sudo lxc-attach -n "$(docker inspect --format "{{.Id}}" plugindevwp)" -- bash -c 'sh /post_launch.sh'
     - docker run --name seleniumserver -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:latest
-    - /bin/bash run_tests.sh
+    - /bin/bash provisioning/run_tests.sh
 

provisioning/destroy_and_rebuild.sh

@@ -5,6 +5,6 @@ sudo docker rm -f devmysql
 sudo docker rm -f plugindevwp
 sudo docker build -t leonstafford/wordpress-static-html-plugin:latest . 
 sudo docker run --name devmysql -e MYSQL_ROOT_PASSWORD=banana -d mariadb
-sudo docker run --name plugindevwp --link devmysql:mysql -p 8080:80 -d -v $(pwd):/app leonstafford/wordpress-static-html-plugin
+sudo docker run --name plugindevwp --link devmysql:mysql -p 8080:80 -d -v $(pwd)/../:/app leonstafford/wordpress-static-html-plugin
 sudo docker exec plugindevwp sh /post_launch.sh
 sudo docker exec -it plugindevwp sh /watch_source_files.sh

provisioning/publish_release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PROJECT_ROOT=$(pwd)
+PROJECT_ROOT=$(pwd)/../
 SVN_ROOT=/home/leon/svnplugindir
 NEW_TAG=1.9
 

provisioning/run_tests.sh

@@ -3,10 +3,10 @@
 sudo docker rm -f devmysql
 sudo docker rm -f plugindevwp
 sudo docker rm -f seleniumserver
-sudo docker build -t leonstafford/wordpress-static-html-plugin:latest . 
+sudo docker build -t leonstafford/wordpress-static-html-plugin:latest ../ 
 sudo docker run --name seleniumserver -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:latest
 sudo docker run --name devmysql -e MYSQL_ROOT_PASSWORD=banana -d mariadb
-sudo docker run --name plugindevwp --link devmysql:mysql -p 8080:80 -d -v $(pwd):/app leonstafford/wordpress-static-html-plugin
+sudo docker run --name plugindevwp --link devmysql:mysql -p 8080:80 -d -v $(pwd)/../:/app leonstafford/wordpress-static-html-plugin
 sudo docker exec plugindevwp sh /post_launch.sh
 
 echo 'what is running now?'