From c418cb6d1d25f5efcdc9d070add424451efad25e Mon Sep 17 00:00:00 2001
From: Etienne Dilocker <etienne@dilocker.de>
Date: Thu, 1 Aug 2019 11:46:06 +0200
Subject: [PATCH] Revert "gh-934 experiment with build cache to speed up ci
 builds"

This reverts commit 31cf3e1317647070ee7daa322d86bc2022bb3f82.
---
 docker-compose-test.yml     | 18 +-----------------
 tools/test/run_ci_server.sh |  3 +--
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index e2e0a5b8ac..e4fb5d765a 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -1,19 +1,11 @@
 version: '3.4'
 services:
-  # Activate to build a new build cache
-  # weaviate_build_cache:
-  #   build:
-  #     context: .
-  #     dockerfile: Dockerfile
-  #     target: build_base
-
   weaviate:
+    image: weaviate/test-server
     build:
       context: .
       dockerfile: Dockerfile
       target: weaviate
-      cache_from:
-        - semitechnologies/weaviatebuildcache:latest
     depends_on:
       - janus
       - genesis_fake
@@ -36,8 +28,6 @@ services:
       context: .
       dockerfile: Dockerfile
       target: genesis_fake
-      cache_from:
-        - semitechnologies/weaviatebuildcache:latest
     restart: on-failure:0
     ports:
       - "8090:8090"
@@ -51,8 +41,6 @@ services:
       context: .
       dockerfile: Dockerfile
       target: telemetry_mock_api
-      cache_from:
-        - semitechnologies/weaviatebuildcache:latest
     restart: on-failure:0
     ports:
       - "8087:8087"
@@ -61,8 +49,6 @@ services:
       context: .
       dockerfile: Dockerfile
       target: remote_weaviate_fake
-      cache_from:
-        - semitechnologies/weaviatebuildcache:latest
     restart: on-failure:0
     ports:
       - "8081:8081"
@@ -70,8 +56,6 @@ services:
     build:
       context: ./tools/remote_weaviate_fake_with_test_schema/
       dockerfile: Dockerfile
-      cache_from:
-        - semitechnologies/weaviatebuildcache:latest
     restart: on-failure:0
     ports:
       - "8082:8082"
diff --git a/tools/test/run_ci_server.sh b/tools/test/run_ci_server.sh
index 3fc8ec5e8c..6fca2f50d7 100755
--- a/tools/test/run_ci_server.sh
+++ b/tools/test/run_ci_server.sh
@@ -5,8 +5,7 @@ set -euo pipefail
 
 function main() {
   echo "Pull images..."
-  surpress_on_success docker pull golang:1.11-alpine 
-  surpress_on_success docker pull semitechnologies/weaviatebuildcache:latest
+  surpress_on_success docker pull golang:1.11-alpine
   echo "Build containers (this will take the longest)..."
   docker-compose -f docker-compose-test.yml build weaviate janus index db telemetry_mock_api \
     genesis_fake remote_weaviate_fake remote_weaviate_fakes_with_test_schema genesis