diff --git a/.travis.yml b/.travis.yml index e577080ea..a58b03c61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ install: - travis_retry pip install -r requirements.txt - travis_retry pip install -r requirements-test.txt - travis_retry export PYTHONPATH=$PWD - # this is needed to install the requirements - # - travis_retry python setup.py install env: - MPLBACKEND=Agg @@ -27,13 +25,23 @@ script: jobs: include: - - stage: deploy + - stage: pypi_deploy + python: 3.6 deploy: provider: pypi user: $PYPI_USERNAME password: $PYPI_PASSWORD on: tags: true + - stage: docker_deploy + if: tag IS present + python: 3.6 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build -t "$TRAVIS_REPO_SLUG" . + - docker tag "$TRAVIS_REPO_SLUG" "$TRAVIS_REPO_SLUG":latest + - docker tag "$TRAVIS_REPO_SLUG" "$TRAVIS_REPO_SLUG":"${TRAVIS_TAG}" + - docker push "$TRAVIS_REPO_SLUG" after_success: - coveralls diff --git a/README.md b/README.md index 988615137..6d9dd2014 100644 --- a/README.md +++ b/README.md @@ -21,14 +21,14 @@ Then input the command: git clone https://github.com/angelolab/ark-analysis.git ``` -Next, you'll need to set up a docker image with all of the required dependencies. - - First, [download](https://hub.docker.com/?overlay=onboarding) docker desktop. - - Once it's sucessfully installed, make sure it is running by looking in toolbar for the Docker whale. +Next, you'll need to set up the Docker image with all of the required dependencies: + - First, [download](https://hub.docker.com/?overlay=onboarding) Docker Desktop. + - Once it's sucessfully installed, make sure it is running by looking in toolbar for the Docker whale. - Once it's running, enter the following commands into terminal ``` cd ark-analysis -docker build -t ark-analysis '.' +docker pull angelolab/ark-analysis:latest ``` You've now installed the code base. diff --git a/setup.py b/setup.py index d7816ba16..2bf3dc296 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.command.build_ext import build_ext as DistUtilsBuildExt from setuptools import setup, find_packages -VERSION = '0.2.9' +VERSION = '0.2.10' # set a long description which is basically the README diff --git a/start_docker.sh b/start_docker.sh index 926a92de3..9dc16eb4f 100755 --- a/start_docker.sh +++ b/start_docker.sh @@ -63,7 +63,7 @@ if [ ! -z "$external" ] -v "$PWD/data:/data" \ -v "$external:/data/external" \ -v "$PWD/.toks:/home/.toks" \ - ark-analysis:latest + angelolab/ark-analysis else docker run -it \ -p $PORT:$PORT \ @@ -73,5 +73,5 @@ if [ ! -z "$external" ] -v "$PWD/$JUPYTER_DIR:/$JUPYTER_DIR" \ -v "$PWD/data:/data" \ -v "$PWD/.toks:/home/.toks" \ - ark-analysis:latest + angelolab/ark-analysis fi