From efc5865789691a6ddb08ec2721d6a64e17b3600b Mon Sep 17 00:00:00 2001 From: Travis Rowland Date: Fri, 26 Jan 2018 02:17:56 -0800 Subject: [PATCH] Was using incorrect variable replacements --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a7ed8b..4e0c531 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,20 +6,20 @@ services: env: global: - NAME=phusion/baseimage - # - VERSION=$(TRAVIS_TAG) - - VERSION=$(TRAVIS_BRANCH) + # - VERSION=${TRAVIS_TAG} + - VERSION=${TRAVIS_BRANCH} before_install: - - docker build -t $(NAME):$(VERSION) . - - env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh + - docker build -t ${NAME}:${VERSION} --rm image + - env NAME=${NAME} VERSION=${VERSION} ./test/runner.sh after_success: - - docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)"; - docker push $(NAME):$(VERSION); + - docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"; + docker push ${NAME}:${VERSION}; # after_success: -# - if [ "$(TRAVIS_BRANCH)" == "master" ]; then -# docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)"; -# docker tag $(NAME):$(VERSION) $(NAME):latest -# docker push $(NAME):$(VERSION); +# - if [ "${TRAVIS_BRANCH}" == "master" ]; then +# docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"; +# docker tag ${NAME}:${VERSION} ${NAME}:latest +# docker push ${NAME}:${VERSION}; # fi