From ced30836a04be0513202ea0d755b75efe3d56583 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 27 Aug 2016 23:19:51 -0700 Subject: [PATCH] GUACAMOLE-93: Move Dockerfile to root of repository. --- .dockerignore | 9 +++++++++ guacamole-docker/Dockerfile => Dockerfile | 0 guacamole-docker/.dockerignore | 3 --- guacamole-docker/.gitignore | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .dockerignore rename guacamole-docker/Dockerfile => Dockerfile (100%) delete mode 100644 guacamole-docker/.dockerignore delete mode 100644 guacamole-docker/.gitignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..cea180242 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,9 @@ + +.git +**/.gitignore + +**/*~ +**/target/ +**/nb-configuration.xml +guacamole/customs.json + diff --git a/guacamole-docker/Dockerfile b/Dockerfile similarity index 100% rename from guacamole-docker/Dockerfile rename to Dockerfile diff --git a/guacamole-docker/.dockerignore b/guacamole-docker/.dockerignore deleted file mode 100644 index 5792b764a..000000000 --- a/guacamole-docker/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -.git -.gitignore diff --git a/guacamole-docker/.gitignore b/guacamole-docker/.gitignore deleted file mode 100644 index b25c15b81..000000000 --- a/guacamole-docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*~