From df5d56673bd8704a499a7e09da2fa233c979b7ce Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Mon, 23 Sep 2019 06:16:55 -0400
Subject: [PATCH] new ci setup

---
 Bakefile             | 5 +++--
 docker-compose.yml   | 4 +++-
 docker/ci.Dockerfile | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Bakefile b/Bakefile
index e6426e9..ffeb1d3 100644
--- a/Bakefile
+++ b/Bakefile
@@ -8,8 +8,9 @@
     lazy_brew pipenv bats
 //python: @skip:key=Pipfile.lock //system
     pipenv install --dev
-test: //build
-    docker-compose run --entrypoint bash bake -c 'set -ex && pipenv install --dev --system --deploy && cd tests && bats *.bats'
+test: build
+    unset BAKEFILE
+    docker-compose run --entrypoint bash ci -c 'set -ex && pip3 uninstall -y bake-cli && pip3 install -e . --upgrade && hash -r && cd tests && bats *.bats --pretty'
 release: test //warn @confirm:secure release//pypi docker/release
 
 //warn:
diff --git a/docker-compose.yml b/docker-compose.yml
index fd3778b..62c69dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     depends_on:
       - core
     volumes:
-      - ./Bakefile:/app/Bakefile
+      # - ./Bakefile:/app/Bakefile
       - .:/app
 
   red:
@@ -42,3 +42,5 @@ services:
       dockerfile: ./docker/ci.Dockerfile
     depends_on:
       - core
+    volumes:
+      - .:/app
diff --git a/docker/ci.Dockerfile b/docker/ci.Dockerfile
index 6e557b8..0703d5c 100644
--- a/docker/ci.Dockerfile
+++ b/docker/ci.Dockerfile
@@ -1,5 +1,7 @@
 FROM kennethreitz/bake:core
 
+ENV TERM xterm
+
 # -- Install CI deps.
 RUN set -ex && \
     apt-get update -qq && \