Make base image build using the common methods

OpenSourceLAN · Apr 28, 2018 · 44be744 · 44be744
1 parent 5d1a767
commit 44be744
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/base/build.sh b/base/build.sh
@@ -2,4 +2,4 @@
 . ../common.sh
 
 [[ -z $TZ && -f /etc/timezone ]] && TZ=`cat /etc/timezone`
-docker build -t base -t base:$(gettimestamp) --build-arg TZ=$TZ .
+docker_build base  Dockerfile "--build-arg TZ=$TZ"
diff --git a/common.sh b/common.sh
@@ -10,6 +10,7 @@ gettimestamp() {
 docker_build() {
 	local NAME=$1
         local DOCKERFILE=$2
+        local OTHERARGS=$3
         local CACHE=""
 
 	[[ -z $NAME ]] && echo "No name provided for docker build" && exit 1
@@ -18,7 +19,7 @@ docker_build() {
 	local PARENT="$(get_docker_parent $NAME)"
 	[[ -n $PARENT ]] && docker_build_if_needed $PARENT
         [[ -n $NOCACHE ]] && CACHE="--no-cache"
-	(cd $BASE_DIR/$NAME && docker build $DOCKERFILE $CACHE -t $NAME -t $NAME:$(gettimestamp) . )
+	(cd $BASE_DIR/$NAME && docker build $DOCKERFILE $CACHE $OTHERARGS -t $NAME -t $NAME:$(gettimestamp) . )
 }
 
 # Builds a container if it doesn't already have a latest