X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=travis%2Fdocker-build-and-push.sh;h=9b654a84703f5d2ad580d39d1620b3e76468e9e4;hb=cdf9a8f77e146500205fd8c560be5a7298b9bbe7;hp=76e2a1322d3728755741fb1111dd9d084732d949;hpb=42f5a6ce479968a8f95dd5a827524865094d6a5c;p=i3%2Fi3 diff --git a/travis/docker-build-and-push.sh b/travis/docker-build-and-push.sh index 76e2a132..9b654a84 100755 --- a/travis/docker-build-and-push.sh +++ b/travis/docker-build-and-push.sh @@ -2,11 +2,14 @@ set -e +BASENAME=$1 +DOCKERFILE=$2 + # .dockerignore is created on demand so that release.sh and other scripts are # not influenced by our travis setup. echo .git > .dockerignore -docker build --pull --no-cache --rm -t=${BASENAME} -f travis-build.Dockerfile . +docker build --pull --no-cache --rm -t=${BASENAME} -f ${DOCKERFILE} . # For pull requests, travis does not add secure environment variables to the # environment (because pull requests could then steal their values), so skip # the login+push step when the variable isn’t set.