Faster travis builds

openspending · May 22, 2018 · 40dec2b · 40dec2b
1 parent 9aa764b
commit 40dec2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,8 @@ IMG    := ${REPO}:${TAG}
 LATEST := ${REPO}:latest
 
 ci-build:
-	docker build -t ${IMG} -t ${LATEST} .
+	docker pull ${LATEST}
+	docker build --cache-from ${LATEST} -t ${IMG} -t ${LATEST} .
 
 ci-run:
 	docker-compose -f docker-compose.ci.yml up -d

diff --git a/conductor/blueprints/package/controllers.py b/conductor/blueprints/package/controllers.py
@@ -24,7 +24,7 @@
 
 os.environ['DPP_DB_ENGINE'] = os.environ['OS_CONDUCTOR_ENGINE']
 if 'DPP_REDIS_HOST' in os.environ:
-    del os.eniron['DPP_REDIS_HOST']
+    del os.environ['DPP_REDIS_HOST']
 os.environ['ELASTICSEARCH_ADDRESS'] = os.environ['OS_ELASTICSEARCH_ADDRESS']
 os.environ['AWS_ACCESS_KEY_ID'] = os.environ['OS_ACCESS_KEY_ID']
 os.environ['AWS_SECRET_ACCESS_KEY'] = os.environ['OS_SECRET_ACCESS_KEY']