Revert "gh-934 experiment with build cache to speed up ci builds"

This reverts commit 31cf3e1.
weaviate · Aug 1, 2019 · c418cb6 · c418cb6
1 parent 31cf3e1
commit c418cb6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git 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,17 +49,13 @@ services:
       context: .
       dockerfile: Dockerfile
       target: remote_weaviate_fake
-      cache_from:
-        - semitechnologies/weaviatebuildcache:latest
     restart: on-failure:0
     ports:
       - "8081:8081"
   remote_weaviate_fakes_with_test_schema: # used for comparing the remote schema against the prototype
     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
@@ -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