diff options
| author | Nao Pross <np@0hm.ch> | 2023-12-29 16:05:47 +0100 |
|---|---|---|
| committer | Nao Pross <np@0hm.ch> | 2023-12-29 16:05:47 +0100 |
| commit | fab5f7dbf472b0a19ea8a73b8546b997d3cf29e0 (patch) | |
| tree | 8fd9ce8cbc96493c224755ec82b3d6a433125c6b | |
| parent | Add Dockerfile without VSCode and Makefile (diff) | |
| download | act4e-mcdp-fab5f7dbf472b0a19ea8a73b8546b997d3cf29e0.tar.gz act4e-mcdp-fab5f7dbf472b0a19ea8a73b8546b997d3cf29e0.zip | |
Update Makefile and Dockerfile
| -rw-r--r-- | Dockerfile | 8 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 8 insertions, 5 deletions
@@ -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 @@ -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 |