master builds not published to dockerhub

[rade]

weaveworks/scope master builds aren't being published to dockerhub. I am quite sure they used to.

AFAICT, the problem is in the circleci.yml:

        test -z "${DOCKER_USER}" || (
          docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS &&
          (test "${DOCKER_ORGANIZATION:-$DOCKER_USER}" != "weaveworks" && (
            for IMAGE in $IMAGES; do
              docker tag weaveworks/$IMAGE:latest ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE:latest &&
              docker tag weaveworks/$IMAGE:$(./tools/image-tag) ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE:$(./tools/image-tag)
            done
          )) &&
          for IMAGE in $IMAGES; do
            docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE &&
            docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE:$(./tools/image-tag)
          done

won't execute the last for loop, which pushes the images, when the test for "not weaveworks" in the preceding expression fails, since that makes the entire sub-expression false.

[rade]

This got broken in 98395bb, which for no apparent reason changed the condition from

... == "weaveworks" ||

to

... != "weaveworks" &&

cc @2opremio