diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b866691..4d62f174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ # Change Log -## [1.2.0](https://github.com/pyouroboros/ouroboros/tree/1.2.0) (2019-02-13) +## [1.2.1](https://github.com/pyouroboros/ouroboros/tree/1.2.1) (2019-02-13) +[Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.2.0...1.2.1) + +**Fixed bugs:** + +- Broken when no :tag specified [\#210](https://github.com/pyouroboros/ouroboros/issues/210) + +**Other Pull Requests** + +- v1.2.1 Merge [\#213](https://github.com/pyouroboros/ouroboros/pull/213) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) +- v1.2.1 to develop [\#212](https://github.com/pyouroboros/ouroboros/pull/212) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) +- fixes \#210 [\#211](https://github.com/pyouroboros/ouroboros/pull/211) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) +- version bump to 1.2.1 + develop branch + twine fix + … [\#209](https://github.com/pyouroboros/ouroboros/pull/209) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) + +## [1.2.0](https://github.com/pyouroboros/ouroboros/tree/1.2.0) (2019-02-14) [Full Changelog](https://github.com/pyouroboros/ouroboros/compare/1.1.2...1.2.0) **Implemented enhancements:** diff --git a/Jenkinsfile b/Jenkinsfile index bd385e0f..d08646d3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -126,7 +126,7 @@ pipeline { steps { sh """ python3 -m venv venv && venv/bin/pip install twine - venv/bin/python setup.py sdist && venv/bin/python -m twine --skip-existing -u ${PYPI_CREDS_USR} -p ${PYPI_CREDS_PSW} upload dist/* + venv/bin/python setup.py sdist && venv/bin/python -m twine upload --skip-existing -u ${PYPI_CREDS_USR} -p ${PYPI_CREDS_PSW} dist/* git tag ${TAG} git push --tags """ diff --git a/pyouroboros/__init__.py b/pyouroboros/__init__.py index 5ae08196..0ffeb46f 100644 --- a/pyouroboros/__init__.py +++ b/pyouroboros/__init__.py @@ -1,2 +1,2 @@ -VERSION = "1.2.0" +VERSION = "1.2.1" BRANCH = "master" diff --git a/pyouroboros/dockerclient.py b/pyouroboros/dockerclient.py index 9299d824..d43c3d88 100644 --- a/pyouroboros/dockerclient.py +++ b/pyouroboros/dockerclient.py @@ -133,6 +133,8 @@ def pull(self, current_tag): if not tag: self.logger.error('Missing tag. Skipping...') raise ConnectionError + elif ':' not in tag: + tag = f'{tag}:latest' self.logger.debug('Checking tag: %s', tag) try: if self.config.dry_run: @@ -236,7 +238,6 @@ def socket_check(self): latest_image = self.pull(current_tag) except ConnectionError: continue - if current_image.id != latest_image.id: updateable.append((container, current_image, latest_image)) else: diff --git a/setup.py b/setup.py index d4e49abc..caeaa52b 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,7 @@ def readme(): setup( name='ouroboros-cli', version=VERSION, + maintainer='circa10a', description='Automatically update running docker containers', long_description=readme(), long_description_content_type='text/markdown',