Skip to content

Commit

Permalink
build script fix
Browse files Browse the repository at this point in the history
  • Loading branch information
nucleardreamer committed Jan 16, 2018
1 parent 75f2e24 commit 9c4a277
Showing 1 changed file with 11 additions and 16 deletions.
27 changes: 11 additions & 16 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@ MANIFEST_TOOL_PATH=$(which manifest-tool);

UNAME_ARCH=$(uname -m);

if [[ $# -lt 3 && $1 == "manifest" ]]; then
if [ ! -e "$MANIFEST_TOOL_PATH" ]; then
echo "";
echo "* manifest-tool missing. Install it so you can use it!.";
echo "";
exit 1;
else
$MANIFEST_TOOL_PATH push from-spec manifest.yml
echo "";
echo "* manifest pushed successfully.";
exit 0;
fi
fi

# The immediate targets are just for intel and arm (raspi)
case $UNAME_ARCH in
x86_64)
Expand Down Expand Up @@ -61,8 +47,6 @@ $DOCKERFILE_TEMPLATE_PATH \
-d FROM_TAG=$FROM_TAG \
-d ELECTRON_VERSION=$ELECTRON_VERSION > Dockerfile

npm uninstall dockerfile-template

# build our base tag
echo "";
echo "** Building $FULL_TAG";
Expand All @@ -76,5 +60,16 @@ if [[ $# -lt 3 && $1 == "push" ]]; then
echo "** Pushing $TAG";
echo "";
docker push $TAG;
if [ ! -e "$MANIFEST_TOOL_PATH" ]; then
echo "";
echo "* manifest-tool missing. Install it so you can use it!.";
echo "";
exit 1;
else
$MANIFEST_TOOL_PATH push from-spec manifest.yml
echo "";
echo "* manifest pushed successfully.";
exit 0;
fi
done;
fi

0 comments on commit 9c4a277

Please sign in to comment.