aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <stephenfinucane@hotmail.com>2016-08-30 00:35:38 +0100
committerStephen Finucane <stephenfinucane@hotmail.com>2016-09-01 19:15:35 +0100
commitc2085586d522fd45aad15899a26207fd6eb5c9c5 (patch)
tree0965fe11e6f64ba650608487faca090832be9a65
parent7f4b27cb2da45b0fa3fe7ae412b9fa760543d36f (diff)
downloadpatchwork-c2085586d522fd45aad15899a26207fd6eb5c9c5.tar
patchwork-c2085586d522fd45aad15899a26207fd6eb5c9c5.tar.gz
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>
-rw-r--r--.dockerignore2
-rw-r--r--Vagrantfile2
-rw-r--r--docker-compose.yml6
-rw-r--r--tools/docker/Dockerfile (renamed from docker/Dockerfile)4
-rw-r--r--tools/docker/bashrc (renamed from docker/bashrc)0
-rw-r--r--tools/docker/db/.dockerignore (renamed from docker/db/.dockerignore)0
-rw-r--r--tools/docker/db/.gitignore (renamed from docker/db/.gitignore)0
-rw-r--r--tools/docker/db/Dockerfile (renamed from docker/db/Dockerfile)0
-rwxr-xr-xtools/docker/entrypoint.sh (renamed from docker/entrypoint.sh)2
-rw-r--r--tools/vagrant/install.sh (renamed from tools/install/install.sh)0
10 files changed, 8 insertions, 8 deletions
diff --git a/.dockerignore b/.dockerignore
index 24473bb..83cfa98 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
.vagrant
-docker/db
+tools/docker/db
diff --git a/Vagrantfile b/Vagrantfile
index b316d41..2ddbca0 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 881a72a..7db3486 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
index ea2a8fc..99a03bd 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
index eb2ed7d..eb2ed7d 100644
--- a/docker/bashrc
+++ b/tools/docker/bashrc
diff --git a/docker/db/.dockerignore b/tools/docker/db/.dockerignore
index 1269488..1269488 100644
--- a/docker/db/.dockerignore
+++ b/tools/docker/db/.dockerignore
diff --git a/docker/db/.gitignore b/tools/docker/db/.gitignore
index 60baa9c..60baa9c 100644
--- a/docker/db/.gitignore
+++ b/tools/docker/db/.gitignore
diff --git a/docker/db/Dockerfile b/tools/docker/db/Dockerfile
index 5df9b5a..5df9b5a 100644
--- a/docker/db/Dockerfile
+++ b/tools/docker/db/Dockerfile
diff --git a/docker/entrypoint.sh b/tools/docker/entrypoint.sh
index 744ed69..d8ca798 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
index 3edec85..3edec85 100644
--- a/tools/install/install.sh
+++ b/tools/vagrant/install.sh