summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile8
-rw-r--r--Makefile5
2 files changed, 8 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile
index a9d37e8..2686a6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,12 @@ WORKDIR /ACT4E
RUN pip3 --disable-pip-version-check --no-cache-dir install -U pip pre-commit
-# COPY .devcontainer/requirements.txt .
-# RUN python3 -m pip install -r requirements.txt
+COPY .devcontainer/requirements.txt .
+RUN python3 -m pip install -r requirements.txt
-COPY act4e-mcdp-hotfix ./act4e-mcdp
+# COPY act4e-mcdp-hotfix ./act4e-mcdp
# RUN python3 -m pip install ./act4e-mcdp
-RUN python3 -m pip install git+https://github.com/NaoPross/ACT4E-mcdp.git@make-it-run
+# RUN python3 -m pip install git+https://github.com/NaoPross/ACT4E-mcdp.git@make-it-run
COPY .devcontainer/act4e-check /usr/local/bin
RUN chmod +x /usr/local/bin/act4e-check
diff --git a/Makefile b/Makefile
index db1c1a7..8102c76 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,11 @@ build: Dockerfile act4e-mcdp-hotfix
shell: build
docker run -it --rm $(tag) /bin/bash
-check: build
+check-first: build
docker run -it --rm $(tag) /bin/bash -c "act4e-mcdp-download-tests --out downloaded && act4e-mcdp-solve-dp-queries --solver act4e_mcdp_solution.DPSolver ./downloaded/lib1-parts"
+check-second: build
+ docker run -it --rm $(tag) /bin/bash -c "act4e-mcdp-download-tests --out downloaded && act4e-mcdp-solve-dp-queries --solver act4e_mcdp_solution.DPSolver ./downloaded/lib2-simple"
+
hotfix-test: build
docker run -it --rm $(tag) act4e-mcdp-download-tests