From 73d95fb9bbe21abd2185a78be76165e1887f90ed Mon Sep 17 00:00:00 2001
From: "Dr. Sergey Pogodin" <dr.pogodin@gmail.com>
Date: Tue, 12 Jun 2018 16:11:00 +0200
Subject: [PATCH] Few extra updates of CI/CD config and Docker releases

---
 .circleci/config.yml       |  5 ++---
 README.md                  |  5 ++---
 docker_build_and_deploy.sh | 14 +++++++++++---
 setup.py                   |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a7ab2dd..3a8df9b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,7 +62,7 @@ jobs:
           command: if [ -z "$CIRCLE_PR_NUMBER" ]; then ./run-integration-tests.sh; fi
           working_directory: /home
 
-  deploy:
+  pypi_release:
     <<: *defaults
     steps:
       - checkout:
@@ -98,7 +98,7 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - deploy:
+      - pypi_release:
           filters:
             branches:
               ignore: /.*/
@@ -114,4 +114,3 @@ workflows:
               only: /v[0-9]+(\.[0-9]+)*/
           requires:
             - test
-            - deploy
diff --git a/README.md b/README.md
index cd90cde4..2cf3ed0e 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,10 @@ Mythril is a security analysis tool for Ethereum smart contracts. It uses concol
 
 ## Installation and setup
 
-Build the [Docker](https://www.docker.com) image:
+Get it with [Docker](https://www.docker.com):
 
 ```bash
-$ git clone https://github.com/ConsenSys/mythril/
-$ docker build mythril
+$ docker pull mythril/myth
 ```
 
 Install from Pypi:
diff --git a/docker_build_and_deploy.sh b/docker_build_and_deploy.sh
index 948397b9..4e3b1a75 100755
--- a/docker_build_and_deploy.sh
+++ b/docker_build_and_deploy.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 
-VERSION=${CIRCLE_TAG#?}
-docker build -t mythril/mythril:${VERSION} .
+NAME=mythril/myth
+
+VERSION_TAG=${NAME}:${CIRCLE_TAG#?}
+LATEST_TAG=${NAME}:latest
+
+docker build -t ${VERSION_TAG} .
+docker tag ${VERSION_TAG} ${LATEST_TAG}
+
 docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-docker push mythril/mythril:${VERSION}
+
+docker push ${VERSION_TAG}
+docker push ${LATEST_TAG}
diff --git a/setup.py b/setup.py
index 9c2e15a7..c50971e6 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ import os
 # Package version (vX.Y.Z). It must match git tag being used for CircleCI
 # deployment; otherwise the build will failed.
 
-VERSION = "v0.18.2"
+VERSION = "v0.18.3"
 
 
 class VerifyVersionCommand(install):