move dockerfile to root

resolve build context issue with dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644 (file)
index 0000000..9845981
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+cache/
+poldekconf/
+rpm/

diff --git a/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to Dockerfile

diff --git a/build-docker.sh b/build-docker.sh
index 0e794285063e74a70c8c3658a075e6e38a9b89db..6aa549a4955688dc55fa32c72e0e317da44190b4 100755 (executable)
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
-# note: docker file is kept in subdir, as docker build uploads context to docker first when building
-# and when it contains poldek cache and rpm root, it's big, unneccessary and may lack of permissions
-# however .dockerignore could solve all that
-docker build --pull -t pld/cleanbuild docker
+set -e
+docker build --pull -t pld/cleanbuild .