Typo in $DOCKER_USERNAME

.travis.yml

@@ -31,15 +31,15 @@ jobs:
         user: $PYPI_USERNAME
         password: $PYPI_PASSWORD
         on:
-          tags: true  # with PyPI, deploy only on a tagged commit to master
+          tags: true
     - stage: docker_deploy
-      if: branch = master  # TODO: change to deploy only on tagged commits once this works
+      if: branch = master
       python: 3.6
       script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "DOCKER_USERNAME" --password-stdin
+        - 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}"  # TODO: fails on a non-tagged commit, either hard code or deploy both PyPI and Docker at the same time
+        - docker tag "$TRAVIS_REPO_SLUG" "$TRAVIS_REPO_SLUG":"${TRAVIS_TAG}"
         - docker push "$TRAVIS_REPO_SLUG"
 
 after_success: