From 4f84be1c312db329a1b87cca8389e29b7b3dfe48 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sun, 28 Aug 2016 12:23:14 -0700
Subject: [PATCH] GUACAMOLE-93: Move Dockerfile to root of repository.

---
 .dockerignore                             | 58 +++++++++++++++++++++++
 src/guacd-docker/Dockerfile => Dockerfile |  0
 src/guacd-docker/.dockerignore            |  3 --
 src/guacd-docker/.gitignore               |  1 -
 4 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 .dockerignore
 rename src/guacd-docker/Dockerfile => Dockerfile (100%)
 delete mode 100644 src/guacd-docker/.dockerignore
 delete mode 100644 src/guacd-docker/.gitignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..3e08b9af
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,58 @@
+
+# Git repository metadata
+.git
+**/.gitignore
+
+# Object code
+**/*.o
+**/*.so
+**/*.lo
+**/*.la
+
+# gcov files
+**/*.gcda
+**/*.gcov
+**/*.gcno
+
+# Backup files
+**/*~
+
+# Release files
+**/*.tar.gz
+
+# Files currently being edited by vim or vi
+**/*.swp
+
+# automake/autoconf
+**/.deps/
+**/.dirstamp
+**/.libs/
+**/Makefile
+**/Makefile.in
+aclocal.m4
+autom4te.cache/
+m4/*
+**/!README
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+test-driver
+
+# Test binaries
+tests/test_*
+!tests/test_*.[ch]
+
+# Generated docs
+doc/doxygen-output
+
diff --git a/src/guacd-docker/Dockerfile b/Dockerfile
similarity index 100%
rename from src/guacd-docker/Dockerfile
rename to Dockerfile
diff --git a/src/guacd-docker/.dockerignore b/src/guacd-docker/.dockerignore
deleted file mode 100644
index 5792b764..00000000
--- a/src/guacd-docker/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-.git
-.gitignore
diff --git a/src/guacd-docker/.gitignore b/src/guacd-docker/.gitignore
deleted file mode 100644
index b25c15b8..00000000
--- a/src/guacd-docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~