From d9f9f0b2a52a823df05f8590fb180f6e1f8a3ea0 Mon Sep 17 00:00:00 2001
From: Carl Mai <carl.mai@tu-dresden.de>
Date: Tue, 28 Aug 2018 15:43:03 +0200
Subject: [PATCH] simplify dockerfile and avoid calling shadowjar twice

---
 Dockerfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 937fbbe33..dcaa6e442 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,10 +70,8 @@ COPY trainbenchmark-generator-json4ag/ trainbenchmark-generator-json4ag/
 COPY trainbenchmark-generator/ trainbenchmark-generator/
 
 RUN ./gradlew --no-daemon initScripts
-RUN ./gradlew --no-daemon generate; true
-RUN ./gradlew --no-daemon dependencies; true
 RUN ./gradlew --no-daemon trainbenchmark-config:build; true
-RUN ./gradlew --no-daemon trainbenchmark-tool-jastadd-base:build; true
+RUN ./gradlew --no-daemon trainbenchmark-tool:build; true
 
 # END prefetch some gradle-dependencies
 
@@ -116,12 +114,10 @@ RUN chown -R user:user /trainbenchmark
 USER user
 
 RUN ./gradlew --no-daemon initScripts
-# first time shadowJar always fails with jastadd-specialized
-RUN ./gradlew --no-daemon build shadowJar -x test; true
+RUN ./gradlew --no-daemon preprocess
 RUN ./gradlew --no-daemon build shadowJar -x test
 
+# when benchmarking run:
 # RUN ./gradlew --no-daemon generate
-
 # RUN ./gradlew --no-daemon individualInjectBenchmark
 # RUN ./gradlew --no-daemon individualRepairBenchmark
-
-- 
GitLab