From b93272d3eabb9673937d46dafea4e65ee6e59ff1 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Thu, 29 Dec 2016 17:45:45 -0500
Subject: [PATCH] cqfd: add -d behaviour
This directory is used to deduce the Dockerfile position
For our usecase it needs to be used conjointly with the -f option since
the dockerfile will be in the client submodule and our cqfdrc file will
be in this repo
Change-Id: Id94a979ba53f6d7132e7d175eee3bb83f1602029
Reviewed-by: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
---
cqfd | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/cqfd b/cqfd
index 057d5ddd..60e7c8d0 100755
--- a/cqfd
+++ b/cqfd
@@ -20,7 +20,8 @@
set -e
PROGNAME=`basename $0`
-dockerfile=".cqfd/docker/Dockerfile"
+cqfd_dir=".cqfd"
+dockerfile="$cqfd_dir/docker/Dockerfile"
cqfdrc=".cqfdrc"
## usage() - print usage on stdout
@@ -30,6 +31,7 @@ Usage: $PROGNAME [OPTION ARGUMENT] [COMMAND] [ARGUMENTS]
Options:
-f <file> Use file as config file (default .cqfdrc)
+ -d <dir> Use directory as cqfd directory (default .cqfd)
-b <flavor_name> Target a specific build flavor.
Commands:
@@ -231,7 +233,7 @@ config_load() {
build_cmd="$command"
if [ -n "$distro" ]; then
- dockerfile=".cqfd/$distro/Dockerfile"
+ dockerfile="$cqfd_dir/$distro/Dockerfile"
fi
release_files="`eval echo $files`"
@@ -263,6 +265,11 @@ while [ $# -gt 0 ]; do
shift
cqfdrc="$1"
;;
+ -d)
+ shift
+ cqfd_dir="$1"
+ dockerfile="$cqfd_dir/docker/Dockerfile"
+ ;;
run|release)
[ "$1" = "release" ] && make_archive=1
if [ $# -gt 1 ]; then
--
GitLab