diff options
| author | Andrea Censi <acensi@ethz.ch> | 2022-02-27 13:07:33 +0100 |
|---|---|---|
| committer | Andrea Censi <acensi@ethz.ch> | 2022-02-27 13:07:33 +0100 |
| commit | 1987cc7f22a139fbd2ead1223ab878cddccd3f96 (patch) | |
| tree | f39d87b3ecbce3d8b28e65fee02eafbeea4c167b | |
| parent | more exercises (diff) | |
| download | act4e-1987cc7f22a139fbd2ead1223ab878cddccd3f96.tar.gz act4e-1987cc7f22a139fbd2ead1223ab878cddccd3f96.zip | |
fix
| -rw-r--r-- | .devcontainer/Dockerfile | 15 | ||||
| -rw-r--r-- | .devcontainer/act4e-check | 16 | ||||
| -rw-r--r-- | .devcontainer/requirements.txt (renamed from requirements.txt) | 0 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Makefile | 12 |
5 files changed, 35 insertions, 10 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f50f4d2..120994e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -10,9 +10,8 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/ RUN pip3 --disable-pip-version-check --no-cache-dir install -U pip pre-commit - # [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. -COPY requirements.txt /tmp/pip-tmp/ +COPY .devcontainer/requirements.txt /tmp/pip-tmp/ RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ && rm -rf /tmp/pip-tmp @@ -21,4 +20,14 @@ RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requ # && apt-get -y install --no-install-recommends <your-package-list-here> # [Optional] Uncomment this line to install global node packages. -# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
\ No newline at end of file +# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1 + +COPY .devcontainer/act4e-check /usr/local/bin +RUN chmod +x /usr/local/bin/act4e-check + + +COPY src src +COPY setup.py . + +RUN python3 -m pip install -e . + diff --git a/.devcontainer/act4e-check b/.devcontainer/act4e-check new file mode 100644 index 0000000..d4fd9e7 --- /dev/null +++ b/.devcontainer/act4e-check @@ -0,0 +1,16 @@ +#!/bin/bash +set -eux +if [ $# -eq 0 ] + then + act4e-test --collections act4e_checks --module act4e_solutions +else +if [ $# -eq 1 ] + then + act4e-test --collections act4e_checks --module act4e_solutions --group $1 +else + echo "Need to pass either 0 or 1 argument" + exit 3 +fi +fi + + diff --git a/requirements.txt b/.devcontainer/requirements.txt index 28fee9e..28fee9e 100644 --- a/requirements.txt +++ b/.devcontainer/requirements.txt @@ -6,7 +6,7 @@ RUN python3 -m pip install -U pip -v WORKDIR /ACT4E RUN uname -a -COPY requirements.txt . +COPY .devcontainer/requirements.txt . RUN python3 -m pip install -r requirements.txt COPY src src @@ -1,9 +1,9 @@ all: -tag=mytag +tag=act4e-image build: - docker build --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) . + docker build -f .devcontainer/Dockerfile --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) . docker-check: build docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \ @@ -14,8 +14,8 @@ docker-check-%: build docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \ act4e-test --collections act4e_checks --module act4e_solutions --group $* -check: - act4e-test --collections act4e_checks --module act4e_solutions +# check: +# act4e-test --collections act4e_checks --module act4e_solutions -check-%: - act4e-test --collections act4e_checks --module act4e_solutions --group $*
\ No newline at end of file +# check-%: +# act4e-test --collections act4e_checks --module act4e_solutions --group $*
\ No newline at end of file |