Use local source in STS/XTA docker build

ftsrg · Jul 29, 2020 · 736647f · 736647f
1 parent 06cd6cd
commit 736647f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/docker/theta-sts-cli.Dockerfile b/docker/theta-sts-cli.Dockerfile
@@ -1,10 +1,11 @@
 FROM openjdk:11.0.6-slim
 
 RUN apt-get update && \
-    apt-get install -y git libgomp1
+    apt-get install -y libgomp1
 
-RUN git clone https://github.com/FTSRG/theta.git && \
-    cd theta && \
+RUN mkdir theta
+COPY . theta
+RUN cd theta && \
     ./gradlew theta-sts-cli:build && \
     cd .. && \
     mv theta/subprojects/sts-cli/build/libs/theta-sts-cli-*-all.jar ./theta-sts-cli.jar

diff --git a/docker/theta-xta-cli.Dockerfile b/docker/theta-xta-cli.Dockerfile
@@ -1,10 +1,11 @@
 FROM openjdk:11.0.6-slim
 
 RUN apt-get update && \
-    apt-get install -y git libgomp1
+    apt-get install -y libgomp1
 
-RUN git clone https://github.com/FTSRG/theta.git && \
-    cd theta && \
+RUN mkdir theta
+COPY . theta
+RUN cd theta && \
     ./gradlew theta-xta-cli:build && \
     cd .. && \
     mv theta/subprojects/xta-cli/build/libs/theta-xta-cli-*-all.jar ./theta-xta-cli.jar

diff --git a/subprojects/cfa-cli/README.md b/subprojects/cfa-cli/README.md
@@ -22,9 +22,9 @@ The runnable jar file will appear under _build/libs/_ with the name _theta-cfa-c
 ### Docker (beta)
 
 An experimental Dockerfile is also available under the _docker_ directory in the root of the repository.
-The image can be built using the following command:
+The image can be built using the following command (from the root of the repository):
 ```
-docker build -t theta-cfa-cli -f theta-cfa-cli.Dockerfile .
+docker build -t theta-cfa-cli -f docker/theta-cfa-cli.Dockerfile .
 ```
 
 The script `run-theta-cfa-cli.sh` can be used for running the containerized version on models residing on the host:

diff --git a/subprojects/sts-cli/README.md b/subprojects/sts-cli/README.md
@@ -22,9 +22,9 @@ The runnable jar file will appear under _build/libs/_ with the name _theta-sts-c
 ### Docker (beta)
 
 An experimental Dockerfile is also available under the _docker_ directory in the root of the repository.
-The image can be built using the following command:
+The image can be built using the following command (from the root of the repository):
 ```
-docker build -t theta-sts-cli -f theta-sts-cli.Dockerfile .
+docker build -t theta-sts-cli -f docker/theta-sts-cli.Dockerfile .
 ```
 
 The script `run-theta-sts-cli.sh` can be used for running the containerized version on models residing on the host:

diff --git a/subprojects/xta-cli/README.md b/subprojects/xta-cli/README.md
@@ -20,9 +20,9 @@ The runnable jar file will appear under _build/libs/_ with the name _theta-xta-c
 ### Docker (beta)
 
 An experimental Dockerfile is also available under the _docker_ directory in the root of the repository.
-The image can be built using the following command:
+The image can be built using the following command (from the root of the repository):
 ```
-docker build -t theta-xta-cli -f theta-xta-cli.Dockerfile .
+docker build -t theta-xta-cli -f docker/theta-xta-cli.Dockerfile .
 ```
 
 The script `run-theta-xta-cli.sh` can be used for running the containerized version on models residing on the host: