Skip to content

Commit 5fcbc75

Browse files

File tree

3 files changed

+33
-42
lines changed

3 files changed

+33
-42
lines changed

.travis.yml

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,39 @@ jobs:
2323
- python: 3.9-dev
2424
- python: pypy3
2525

26-
- stage: Deploy latest image on DockerHub
27-
script: skip
26+
- stage: Build docker image by commit and deploy on DockerHub
27+
script:
28+
- set -e
29+
- docker build -f Dockerfile -t "${REPO}:${TRAVIS_COMMIT}" .
30+
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASS"
31+
- docker push "$REPO"
32+
33+
- stage: Tag docker image with branch
34+
if: branch IS present
35+
script:
36+
- set -e
37+
- docker pull "${REPO}:${TRAVIS_COMMIT}"
38+
- docker tag "${REPO}:${TRAVIS_COMMIT}" "${REPO}:latest"
39+
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASS"
40+
- docker push "$REPO"
41+
42+
- stage: Tag docker image as latest
2843
if: branch = master
29-
deploy:
30-
- provider: script
31-
script: scripts/travis_create_docker_image_branch.sh
32-
on:
33-
repo: IdentityPython/SATOSA
34-
branch: master
44+
script:
45+
- set -e
46+
- docker pull "${REPO}:${TRAVIS_COMMIT}"
47+
- docker tag "${REPO}:${TRAVIS_COMMIT}" "${REPO}:latest"
48+
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASS"
49+
- docker push "$REPO"
50+
51+
- stage: Tag docker image with git-tag
52+
if: tag IS present
53+
script:
54+
- set -e
55+
- docker pull "${REPO}:${TRAVIS_COMMIT}"
56+
- docker tag "${REPO}:${TRAVIS_COMMIT}" "${REPO}:${TRAVIS_TAG}"
57+
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASS"
58+
- docker push "$REPO"
3559

3660
- stage: Deploy new release on GitHub
3761
if: tag IS present
@@ -57,17 +81,8 @@ jobs:
5781
repo: IdentityPython/SATOSA
5882
tags: true
5983

60-
- stage: Deploy new release on DockerHub
61-
if: tag IS present
62-
script: skip
63-
deploy:
64-
- provider: script
65-
script: scripts/travis_create_docker_image_tag.sh
66-
on:
67-
repo: IdentityPython/SATOSA
68-
tags: true
69-
7084
env:
7185
global:
7286
- secure: ymdbaVVKJFq193xn+pr7sRyjkcOBtpm6eu+A9QsdtzO6vhaj+MhFfsjWAJbGiaSvX691bLd+9kFqH76HViN1LbmkCujBm2+4k0DBSakb70T/81UNNpYGy4iIYzCKaWPPSwvFGfRjNY14RILEpOI8NCkJuDMuO7CiGkwOtmlOdP/tYdV9T3p36Hgpwa/0U5kIahqwnbBKiwjGGhI8YA4Ik01P4biEv3Fr++jS4dhzMe+hYjWDXW+bksf9OikbtJkPzHlZxCDgFH4yNY1TH6P3X/B8NLTrvpNZOj2GgQoZBDrTEM+RLdaLQ8EYcrJaEaOZs65Jicpw5Ycz8DHUuBXwlSiG1g/VJlzxYchGxnLguVyEELEm7p7vhDFYNOROL3J4PpY8E1+L834xzmhCqbHM2kHB2WeiIob0j1Hq7U1802tFuM+tu8P4gdEyGxstQaIehiTI/VQEJm+sKB1W5xtDQokrnMyiQfJy4K7T4ZrONV/gVhb85ayS6eF/Xu1vr/5s/fWyQOxNKvoeEiO6VVoLTWNPEysTewLFc8o7HcE/Qnv/67IwuK/vx0ZlESbNCRgTfqyWpn5vybyWmgo9aUC51hDiVQtZfVeaoF/Xtg2yxVn/4C1aPybpA2Oacll8LjyYwyoCeH3naD0j9Msy4izny2PF7MTT4iNbtwhRoAAqXic=
7387
- secure: loJ+Bfind3tbEVrWqEalZT5bMqGFrMewo3jDwH9iJEw28tl+PasTCvCOJRsOomtdMp2QZh8e5wwnL1m7mkHWZaBDMxAg2mXlEv2W817SyAKkgFVnjXr8FJK4kjGAA5l2WXWKo7HKs2lOygZaDxj67i4htvg6cIxVf3dnI+MHpN5CONBfF6cXkFGMZoW+uc2diApyvIVCzte0JZkp6ZepWiyjelPl38pgWlD9elJEUaut0qKGZHtsRnLgTOzbBl49FV4lzCqt7wBnnwwQpTtvEyRW47O/VMYORAFFXpgUDPejE37+bf1wS6hlr0vSHFSUKILQWUH0l09+BPrxpoRj5SYkFD18xvqlWDNrNoANSMgRm/8cL1ucd7T5N03lKtNpaKT2ejHPj6Hu86mXFvcxcZnIcH7ppmXjZU2xfI2ytmmqxXysYeiCc6RgClmFBf3lnZz7iaHVrL8tU1x+eDzEQKvDbYHQnO9+4xXY37PH4ViJJEDoLq3NGhKxbDJ4oMgtz0mrjdWm8a1nWXIm8QTs2+oIhf+HrCpdqE8FfKnI7OyM8C+cwraApY77cZ9xfBqJGDQIgX3c+syB1ufVxY/DPDOXTysRUUHyWVgJeaL8EJEiMVnZMoGliY7QtnBznOglxynekIIaaZ5FMfh8hwA0pQ5idruqrtzVkBQoq8CdHfk=
88+
- REPO: "satosa/satosa"

scripts/travis_create_docker_image_branch.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

scripts/travis_create_docker_image_tag.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)