From 32aa0cbea912406c56fe56e5e5e3858a987bb14e Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sat, 12 Jun 2021 17:52:54 +0200 Subject: [PATCH] refactor .dockerignore; fix --- .dockerignore => build-archiso/.dockerignore | 0 build-archiso/run.sh | 6 +++--- build-pkg/.dockerignore | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) rename .dockerignore => build-archiso/.dockerignore (100%) create mode 100644 build-pkg/.dockerignore diff --git a/.dockerignore b/build-archiso/.dockerignore similarity index 100% rename from .dockerignore rename to build-archiso/.dockerignore diff --git a/build-archiso/run.sh b/build-archiso/run.sh index f0cd259..a94adb4 100755 --- a/build-archiso/run.sh +++ b/build-archiso/run.sh @@ -22,11 +22,11 @@ function isEmptyDir() { # arg $1: directory to check if [ -z "$(find "${1}" -maxdepth 0 -type d -empty 2>/dev/null)" ]; then - # "Empty directory" - return 0 - else # echo "Not empty or NOT a directory" return 1 + else + # "Empty directory" + return 0 fi } diff --git a/build-pkg/.dockerignore b/build-pkg/.dockerignore new file mode 100644 index 0000000..ca36dd0 --- /dev/null +++ b/build-pkg/.dockerignore @@ -0,0 +1,3 @@ +* +!Dockerfile +!run.sh