[projects/cleanbuild] move dockerfile to root

glen glen at pld-linux.org
Wed Dec 14 21:41:19 CET 2016


commit bdd660f0fe81e43fd484838fbc5c5c925225986c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Dec 14 22:39:16 2016 +0200

    move dockerfile to root
    
    resolve build context issue with dockerignore

 .dockerignore                   | 3 +++
 docker/Dockerfile => Dockerfile | 0
 build-docker.sh                 | 6 ++----
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
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 0e79428..6aa549a 100755
--- 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 .
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/bdd660f0fe81e43fd484838fbc5c5c925225986c



More information about the pld-cvs-commit mailing list