Skip to content
This repository has been archived by the owner on Mar 16, 2021. It is now read-only.

Commit

Permalink
posix-ize .sh files some more, cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
ainola committed Oct 29, 2017
1 parent 69a451d commit 2bb0db1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions build-dev-images.sh
@@ -1,16 +1,16 @@
#!/usr/bin/env bash
#!/bin/sh

VERSION=dev

# Build the binaries
docker run --rm -v $PWD:/go/src/github.com/Boostport/kubernetes-vault -w /go/src/github.com/Boostport/kubernetes-vault golang:1.9-alpine ./build.sh
docker run --rm -v "$PWD":/go/src/github.com/Boostport/kubernetes-vault -w /go/src/github.com/Boostport/kubernetes-vault golang:1.9-alpine ./build.sh

# Build the images
docker build -t boostport/kubernetes-vault:$VERSION -f cmd/controller/Dockerfile.dev cmd/controller/
docker build -t boostport/kubernetes-vault-init:$VERSION -f cmd/init/Dockerfile.dev cmd/init/
docker build -t boostport/kubernetes-vault-sample-app:$VERSION -f cmd/sample-app/Dockerfile.dev cmd/sample-app/
docker build -t boostport/kubernetes-vault:"$VERSION" -f cmd/controller/Dockerfile.dev cmd/controller/
docker build -t boostport/kubernetes-vault-init:"$VERSION" -f cmd/init/Dockerfile.dev cmd/init/
docker build -t boostport/kubernetes-vault-sample-app:"$VERSION" -f cmd/sample-app/Dockerfile.dev cmd/sample-app/

# Push images
docker push boostport/kubernetes-vault:$VERSION
docker push boostport/kubernetes-vault-init:$VERSION
docker push boostport/kubernetes-vault-sample-app:$VERSION
docker push boostport/kubernetes-vault:"$VERSION"
docker push boostport/kubernetes-vault-init:"$VERSION"
docker push boostport/kubernetes-vault-sample-app:"$VERSION"
4 changes: 2 additions & 2 deletions cmd/controller/docker-entrypoint.sh
Expand Up @@ -33,8 +33,8 @@ for i in "$@" ; do
fi
done

if [ "$HAS_CONFIG_FLAG" = false -a "$HAS_LOG_LEVEL_FLAG" = true ] || [ $NUM_ARGS = 0 ] ; then
if [ "$HAS_CONFIG_FLAG" = false -a "$HAS_LOG_LEVEL_FLAG" = true ] || [ "$NUM_ARGS" = 0 ] ; then
set -- "$@" --config="$CONFIG_FILE"
fi

exec "$@"
exec "$@"

0 comments on commit 2bb0db1

Please sign in to comment.