Skip to content

Commit

Permalink
feat(dockerhub): deploy images
Browse files Browse the repository at this point in the history
fix(travis): add deploy condition
  • Loading branch information
javierbertoli committed Nov 14, 2019
1 parent d5b5593 commit f20a1a7
Showing 1 changed file with 21 additions and 13 deletions.
34 changes: 21 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ services:
- docker

env:
global:
- TRAVIS_SECURE_ENV_VARS: true

# VARS:
# DN: distro name (amazonlinux, archlinux, centos, debian, fedora, opensuse, ubuntu)
# DV: distro version
Expand Down Expand Up @@ -86,8 +89,7 @@ env:
# adding the inspec license-accepted file as different lines because of
# https://travis-ci.community/t/multiline-commands-have-two-spaces-in-front-breaks-heredocs/2756/4
before_install:
- gem install inspec
- gem install inspec-bin
- gem install inspec inspec-bin
- mkdir -p ~/.chef/accepted_licenses
- "echo '---' > ~/.chef/accepted_licenses/inspec"
- "echo 'name: inspec' >> ~/.chef/accepted_licenses/inspec"
Expand All @@ -100,21 +102,27 @@ before_install:
install:
- export TAG=$(echo ${DN} | sed "s#/#-#g")-${DV}
- "echo \"Building: ${TAG}\""
- |
docker build . \
--file "Dockerfile.${PI}" \
--tag "${TAG}" \
--build-arg DISTRO_NAME="${DN}" \
--build-arg DISTRO_VERSION="${DV}" \
--build-arg SALT_VERSION="${SV}" \
--build-arg SALT_INSTALL_METHOD="${SIM}" \
--build-arg PYTHON_VERSION="${PV}" \
- docker build .
--file "Dockerfile.${PI}"
--tag "${TAG}"
--build-arg DISTRO_NAME="${DN}"
--build-arg DISTRO_VERSION="${DV}"
--build-arg SALT_VERSION="${SV}"
--build-arg SALT_INSTALL_METHOD="${SIM}"
--build-arg PYTHON_VERSION="${PV}"
--build-arg EXTRA_PACKAGES="${EP}"

script:
- docker run --detach=true --name "inspec-${DN}-${TAG}" "${TAG}" tail -f /dev/null
- inspec exec test/integration --input py_version="${PV}" salt_version="${SV}" --target=docker://"inspec-${DN}-${TAG}"

# Using after_success because deploy does not support docker.
after_success:
# - "echo \"${DOCKERHUB_PASSWORD}\" | docker login -u \"${DOCKERHUB_USER}\" --password-stdin"
- "echo docker push ${DOCKERHUB_USER}/salt-${SV}-py${PV}:${TAG}"
- test $TRAVIS_BRANCH = "master" &&
echo Push to DockerHub
- test $TRAVIS_BRANCH = "master" &&
echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USER}" --password-stdin
- test $TRAVIS_BRANCH = "master" &&
docker tag ${TAG} ${DOCKERHUB_USER}/salt-${SV}-py${PV}:${TAG}
- test $TRAVIS_BRANCH = "master" &&
docker push ${DOCKERHUB_USER}/salt-${SV}-py${PV}:${TAG}

0 comments on commit f20a1a7

Please sign in to comment.