Skip to content
This repository has been archived by the owner on Nov 19, 2020. It is now read-only.

Commit

Permalink
Merge pull request #3 from praekeltfoundation/dcd
Browse files Browse the repository at this point in the history
Use docker-ci-deploy
  • Loading branch information
JayH5 committed Feb 15, 2017
2 parents cf634ad + f59dd87 commit 29df6a4
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 207 deletions.
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# Python caches
__pycache__/
*.pyc

# Coverage stuff
.coverage
.coverage.*
*,cover
coverage.xml
htmlcov/
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,22 @@ before_install:
- sudo apt-get update
- sudo apt-get install -qy -o Dpkg::Options::="--force-confold" docker-engine

install:
- pip install 'coverage >= 4.3' flake8

before_script:
- image="praekeltfoundation/marathon-acme"
- version="$(sed -nE 's/\s*marathon-acme\s*==\s*([^\s\;]+).*/\1/p' requirements.txt)"

script:
- docker build --tag "$image" .
- ./test.py "$image"
- coverage run --include=deploy.py ./test_deploy.py && coverage report -m
- flake8 .

after_script:
- docker images

before_deploy:
- pip install docker-ci-deploy==0.2.0
- docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS"
deploy:
provider: script
script: ./deploy.py "$image" "$version" --latest
script: dcd --tag-version "$version" --tag-semver --tag-latest "$image"
on:
branch: master
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2016, Praekelt Foundation
Copyright (c) 2017, Praekelt.org
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
116 changes: 0 additions & 116 deletions deploy.py

This file was deleted.

77 changes: 0 additions & 77 deletions test_deploy.py

This file was deleted.

0 comments on commit 29df6a4

Please sign in to comment.