From bdd660f0fe81e43fd484838fbc5c5c925225986c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 14 Dec 2016 22:39:16 +0200 Subject: [PATCH] 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(-) create mode 100644 .dockerignore rename docker/Dockerfile => Dockerfile (100%) 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 . -- 2.44.0