mirror of
https://github.com/phusion/baseimage-docker.git
synced 2026-03-26 04:18:46 +00:00
Was using incorrect variable replacements
This commit is contained in:
20
.travis.yml
20
.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
|
||||
|
||||
Reference in New Issue
Block a user