Merge branch 'master' of https://git.kmlabz.com/GoldenPogacsa/consumer-scheduler
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Kocsis Richárd 2020-03-30 15:43:21 +02:00
commit 76f359a444

View File

@ -25,17 +25,10 @@ steps:
from_secret: DOCKER_PASSWORD from_secret: DOCKER_PASSWORD
commands: commands:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
<<<<<<< HEAD
- docker build -t="$DOCKER_USERNAME/consumer" .
- docker build -t="$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER" .
- docker push "$DOCKER_USERNAME/consumer"
- docker push "$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER"
=======
- docker build -t="$DOCKER_USERNAME/consumer-scheduler" . - docker build -t="$DOCKER_USERNAME/consumer-scheduler" .
- docker build -t="$DOCKER_USERNAME/consumer-scheduler:$DRONE_BUILD_NUMBER" . - docker build -t="$DOCKER_USERNAME/consumer-scheduler:$DRONE_BUILD_NUMBER" .
- docker push "$DOCKER_USERNAME/consumer-scheduler" - docker push "$DOCKER_USERNAME/consumer-scheduler"
- docker push "$DOCKER_USERNAME/consumer-scheduler:$DRONE_BUILD_NUMBER" - docker push "$DOCKER_USERNAME/consumer-scheduler:$DRONE_BUILD_NUMBER"
>>>>>>> 7972566edb8660d7ba3ee0dcc58ee8740922f62c
- name: slack - name: slack
image: plugins/slack image: plugins/slack