Merge pull request #47 from elixir-cloud-aai/improve-local-build

Make a bit better the scripts

scripts/dockerBuild

@@ -1,10 +1,31 @@
-
-
-# 
+#!/bin/bash
+#
 # Usage:
-# 
+#
 #     buildDockerImage filer          or
 #     buildDockerImage taskmaster
-# 
+#
+
+IMAGE=$1
+
+if [ -z "$IMAGE" ];
+then
+  echo "Use: $0 <filer/taskmaster> [tag]"
+  exit 12
+fi
+
+TAG=$2
+
+if [ -z "$TAG" ];
+then
+  TAG=testing
+fi
 
-docker build -t "eu.gcr.io/tes-wes/$1:testing" -f "containers/$1.Dockerfile" .
+if command -V buildah;
+then
+  buildah bud -t "docker.io/elixircloud/tesk-core-$IMAGE:$TAG" \
+    --format=docker --no-cache \
+    -f "containers/$IMAGE.Dockerfile"
+else
+  docker build -t "docker.io/elixircloud/tesk-core-$1:$TAG" -f "containers/$1.Dockerfile" .
+fi

scripts/dockerRun

@@ -1,13 +1,12 @@
-
-# 
+#!/bin/bash
+#
 # Usage:
-# 
+#
 #     buildRun filer          or
 #     buildRun taskmaster
-# 
+#
 
 imageName="$1"
 shift
 
-docker run "eu.gcr.io/tes-wes/$imageName:testing" "$@"
-
+docker run "docker.io/elixircloud/tesk-core-$imageName:testing" "$@"