Actually use our code in tests

.dockerignore

@@ -1,2 +1,3 @@
 vncdriver/logs
 .git
+*.pyc

.travis.yml

@@ -4,7 +4,6 @@ python:
 services:
   - docker
 before_install:
-  - docker login quay.io -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
   - docker build -f test.dockerfile -t quay.io/openai/universe:test .
 script:
   - docker run -v /usr/bin/docker:/usr/bin/docker -v /root/.docker:/root/.docker -v /var/run/docker.sock:/var/run/docker.sock --net=host quay.io/openai/universe:test
@@ -18,5 +17,6 @@ notifications:
     on_success: always
     on_failure: always
 after_success:
+  - docker login quay.io -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
    - docker tag quay.io/openai/universe:test quay.io/openai/universe-travis:passed-ci
    - docker push quay.io/openai/universe-travis:passed-ci  # This repo is used by universe-envs to run integration test

Makefile

@@ -4,14 +4,15 @@ upload:
 	twine upload dist/*
 
 test:
-	docker run -v $(pwd):/usr/local/universe -v /usr/bin/docker:/usr/bin/docker -v ~/.docker:/root/.docker -v /var/run/docker.sock:/var/run/docker.sock --net=host quay.io/openai/universe:test
+	docker run -v /usr/bin/docker:/usr/bin/docker -v /root/.docker:/root/.docker -v /var/run/docker.sock:/var/run/docker.sock --net=host quay.io/openai/universe:test
 
-base:
-	docker build -t quay.io/openai/universe:base .
+push:
+	docker build -t quay.io/openai/universe .
 	docker build -f test.dockerfile -t quay.io/openai/universe:test .
 
-	docker push quay.io/openai/universe:base
+	docker push quay.io/openai/universe
 	docker push quay.io/openai/universe:test
 
 test-push:
+	docker build -f test.dockerfile -t quay.io/openai/universe:test .
 	docker push quay.io/openai/universe:test

test.dockerfile

@@ -1,6 +1,10 @@
-FROM quay.io/openai/universe:base
+FROM quay.io/openai/universe
 
 RUN pip install tox
 
+# Upload our actual code
+WORKDIR /usr/local/universe/
+COPY . ./
+
 # Run tox. Keep printing so Travis knows we're alive.
 CMD ["bash", "-c", "( while true; do echo '.'; sleep 60; done ) & tox"]