From 9752d4b930301d7e99234ab3028da005045ef3a8 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Fri, 29 Jun 2018 16:57:39 +0200
Subject: [PATCH] Move files

---
 .dockerignore                         | 13 +++++++++++++
 .travis.yml                           |  2 +-
 docker/Dockerfile => Dockerfile       |  0
 docker/.dockerignore                  |  1 -
 docker/entrypoint.sh => entrypoint.sh |  0
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 .dockerignore
 rename docker/Dockerfile => Dockerfile (100%)
 delete mode 100644 docker/.dockerignore
 rename docker/entrypoint.sh => entrypoint.sh (100%)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..617e694
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,13 @@
+/.dev
+/.idea
+/*.iml
+
+/.git
+/.res
+/examples
+/.editorconfig
+/.gitignore
+/.travis.yml
+/CHANGELOG.md
+/LICENSE
+/README.md
diff --git a/.travis.yml b/.travis.yml
index ebeae3e..97f88f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ install:
     docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
     --build-arg VCS_REF=${TRAVIS_COMMIT::8} \
     --build-arg VERSION=${VERSION} \
-    -t $DOCKER_USERNAME/$DOCKER_REPONAME -f ./docker/Dockerfile ./docker
+    -t $DOCKER_USERNAME/$DOCKER_REPONAME .
 
 before_script:
   - docker run -d -p 8000:80 -e JLS_VIRTUAL_HOSTS=$WAN_IP --name $DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to Dockerfile
diff --git a/docker/.dockerignore b/docker/.dockerignore
deleted file mode 100644
index 8e924d9..0000000
--- a/docker/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-/docker-compose.yml
diff --git a/docker/entrypoint.sh b/entrypoint.sh
similarity index 100%
rename from docker/entrypoint.sh
rename to entrypoint.sh