From: Stephen Finucane <stephenfinucane@hotmail.com>
Date: Mon, 29 Aug 2016 23:35:38 +0000 (+0100)
Subject: docker: Move 'docker' directory to 'tools'
X-Git-Tag: v2.0.0-rc1~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2085586d522fd45aad15899a26207fd6eb5c9c5;p=thirdparty%2Fpatchwork.git

docker: Move 'docker' directory to 'tools'

...like the Vagrant scripts (which have been renamed also).

Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com>
Acked-by: Daniel Axtens <dja@axtens.net>
---

diff --git a/.dockerignore b/.dockerignore
index 24473bbe..83cfa98a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
 .vagrant
-docker/db
+tools/docker/db
 
diff --git a/Vagrantfile b/Vagrantfile
index b316d41f..2ddbca09 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,5 +22,5 @@ Vagrant.configure(2) do |config|
   #   vb.memory = "1024"
   # end
 
-  config.vm.provision :shell, :path => "tools/install/install.sh"
+  config.vm.provision :shell, :path => "tools/vagrant/install.sh"
 end
diff --git a/docker-compose.yml b/docker-compose.yml
index 881a72ad..7db3486a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,12 +5,12 @@
 # or upgrade to v2 and use the build-arg to override it.
 
 db:
-  build: docker/db
+  build: tools/docker/db
   volumes:
-   - ./docker/db/data:/var/lib/mysql
+   - ./tools/docker/db/data:/var/lib/mysql
 web:
   build: .
-  dockerfile: ./docker/Dockerfile
+  dockerfile: ./tools/docker/Dockerfile
   command: python3 manage.py runserver 0.0.0.0:8000
   volumes:
     - .:/home/patchwork/patchwork/
diff --git a/docker/Dockerfile b/tools/docker/Dockerfile
similarity index 92%
rename from docker/Dockerfile
rename to tools/docker/Dockerfile
index ea2a8fc5..99a03bde 100644
--- a/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -32,14 +32,14 @@ RUN pip3  install virtualenv tox && \
 # we deliberately leave the requirements files in tmp so we can
 # ping the user in entrypoint.sh if the change them!
 
-COPY docker/bashrc /tmp/bashrc
+COPY tools/docker/bashrc /tmp/bashrc
 
 # we put the code in ~/patchwork rather than ~ so that we
 # can put in these bashrc snippets without dirtying the
 # working directory
 RUN cat /tmp/bashrc >> /home/patchwork/.bashrc
 
-COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY tools/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 USER patchwork
diff --git a/docker/bashrc b/tools/docker/bashrc
similarity index 100%
rename from docker/bashrc
rename to tools/docker/bashrc
diff --git a/docker/db/.dockerignore b/tools/docker/db/.dockerignore
similarity index 100%
rename from docker/db/.dockerignore
rename to tools/docker/db/.dockerignore
diff --git a/docker/db/.gitignore b/tools/docker/db/.gitignore
similarity index 100%
rename from docker/db/.gitignore
rename to tools/docker/db/.gitignore
diff --git a/docker/db/Dockerfile b/tools/docker/db/Dockerfile
similarity index 100%
rename from docker/db/Dockerfile
rename to tools/docker/db/Dockerfile
diff --git a/docker/entrypoint.sh b/tools/docker/entrypoint.sh
similarity index 97%
rename from docker/entrypoint.sh
rename to tools/docker/entrypoint.sh
index 744ed690..d8ca7984 100755
--- a/docker/entrypoint.sh
+++ b/tools/docker/entrypoint.sh
@@ -27,7 +27,7 @@ EOF
 
 # check if patchwork is mounted. Checking if we exist is a
 # very good start!
-if [ ! -f ~patchwork/patchwork/docker/entrypoint.sh ]; then
+if [ ! -f ~patchwork/patchwork/tools/docker/entrypoint.sh ]; then
     echo "The patchwork directory doesn't seem to be mounted!"
     echo "Are you using docker-compose?"
     echo "If not, you need -v PATH_TO_PATCHWORK:/home/patchwork/patchwork"
diff --git a/tools/install/install.sh b/tools/vagrant/install.sh
similarity index 100%
rename from tools/install/install.sh
rename to tools/vagrant/install.sh