1
0
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 12:29:07 +00:00

Was using incorrect variable replacements

This commit is contained in:
Travis Rowland
2018-01-26 02:17:56 -08:00
parent 300b96fb93
commit efc5865789

View File

@@ -6,20 +6,20 @@ services:
env: env:
global: global:
- NAME=phusion/baseimage - NAME=phusion/baseimage
# - VERSION=$(TRAVIS_TAG) # - VERSION=${TRAVIS_TAG}
- VERSION=$(TRAVIS_BRANCH) - VERSION=${TRAVIS_BRANCH}
before_install: before_install:
- docker build -t $(NAME):$(VERSION) . - docker build -t ${NAME}:${VERSION} --rm image
- env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh - env NAME=${NAME} VERSION=${VERSION} ./test/runner.sh
after_success: after_success:
- docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)"; - docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
docker push $(NAME):$(VERSION); docker push ${NAME}:${VERSION};
# after_success: # after_success:
# - if [ "$(TRAVIS_BRANCH)" == "master" ]; then # - if [ "${TRAVIS_BRANCH}" == "master" ]; then
# docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)"; # docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
# docker tag $(NAME):$(VERSION) $(NAME):latest # docker tag ${NAME}:${VERSION} ${NAME}:latest
# docker push $(NAME):$(VERSION); # docker push ${NAME}:${VERSION};
# fi # fi