From 523b0282706e93aef8cfab8f65a2d0b1961b6e5a Mon Sep 17 00:00:00 2001
From: Carl Mai <carl.schoenbach@gmail.com>
Date: Thu, 6 Sep 2018 12:10:00 +0200
Subject: [PATCH] small modification to readme and dockerfile
---
Dockerfile | 5 +++--
README.md | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 026776b4e..8ef017a0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,10 +29,11 @@ RUN Rscript /trainbenchmark/trainbenchmark-reporting/install.R
WORKDIR /trainbenchmark
COPY trainbenchmark/ /trainbenchmark/
-RUN chown -R user:user /trainbenchmark
COPY docker /trainbenchmark/docker
-RUN chown -R user:user /trainbenchmark/docker
COPY docker/bashrc /home/user/.bashrc
+RUN chown -R user:user /trainbenchmark
+RUN chown -R user:user /home/user/.bashrc
+USER user
RUN ./gradlew --no-daemon preprocess
RUN ./gradlew --no-daemon build shadowJar -x test
diff --git a/README.md b/README.md
index 835c6bc70..7e46cc5c6 100644
--- a/README.md
+++ b/README.md
@@ -108,8 +108,8 @@ There are some naming conventions:
- Model serialization-related modules start with `trainbenchmark-generator`.
- All other modules are core modules of the bechmark.
-Since the JastAdd-based solutions use a preprocessor to generate Java files, for the presented variant, it is even more compolicated.
-Each JastAdd configuraration must be presented to the benchmark as a separate tool. Thus there are two directories for each variant, one for the bacht processing mode and one for the incremental mode.
+The JastAdd-based solutions use a preprocessor to generate Java files, for the presented variant.
+Each JastAdd configuraration must be presented to the benchmark as a separate tool. Thus there are two directories for each variant, one for the batch processing mode and one for the incremental mode.
Because these two modes share almost all the source code, a third directory is used to store this shared code.
Finally, there is a directory for code shared between all JastAdd variants.
These are the important directories:
@@ -150,7 +150,6 @@ However, since there are some software requirements imposed by the benchmark, pa
- Steps:
- Unpack the provided archive and open a terminal in the extracted directory
- `docker build -t trainbenchmark .`
- - `docker run -it trainbenchmark`
##### Running the Docker Image
--
GitLab