Recompute analysis results in dockerized environment #24

Merged
mih merged 6 commits from docker into master 2023-10-12 17:06:29 +00:00
19 changed files with 39 additions and 6 deletions

1
.datalad/.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
config annex.largefiles=nothing

14
.datalad/config Normal file
View file

@ -0,0 +1,14 @@
[datalad "dataset"]
id = c5a79271-7d24-42aa-a0cf-38d84fd15eaa
[datalad "containers.docker-make"]
image = container/image
# this uses the standard docker adaptor, which mounts PWD at /tmp
# inside the container, we create a fake temporary HOME, because
# some commands write information to it that could be useful for
# debugging potential problems. However, by default we delete
# it again after the payload exits
cmdexec = "{{python}} -m datalad_container.adapters.docker run {img} sh -c \"mkdir /tmp/dockertmp; HOME=/tmp/dockertmp make -f Docker-Makefile {cmd} && rm -rf /tmp/dockertmp\""
[datalad "run.substitutions"]
# use the "standard" python from a venv (or alike), if there is need
# for a different one, this value can be overriden from the outside
python=python

3
.gitattributes vendored Normal file
View file

@ -0,0 +1,3 @@
* annex.backend=MD5E
/* annex.largefiles=nothing
**/.git* annex.largefiles=nothing

1
.gitignore vendored
View file

@ -12,3 +12,4 @@ main.pdf
example.eps
img/*eps-converted-to.pdf
*-stamp
dockertmp

1
code/.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
* annex.largefiles=nothing

1
container/.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
/* annex.largefiles=nothing

View file

@ -1,7 +1,6 @@
FROM debian:bookworm-slim
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -qq -y --allow-releaseinfo-change && \
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq -y --allow-releaseinfo-change && \
# basic tooling we need for building/installing
apt-get install -q --no-install-recommends -y make && \
# for compiling custom python package installs

3
container/image/.gitattributes vendored Normal file
View file

@ -0,0 +1,3 @@
**/*json annex.largefiles=nothing
repositories annex.largefiles=nothing
**/VERSION annex.largefiles=nothing

View file

@ -0,0 +1 @@
{"id":"360338cd2a802f4812f06fbc50237a42bc0303390efa7fa321c381e6ec36d1ae","created":"1970-01-01T01:00:00+01:00","container_config":{"Hostname":"","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"os":"linux"}

View file

@ -0,0 +1 @@
../../../.git/annex/objects/GG/fg/MD5E-s77814784--21d915740e64e08ccf966947c51eae95.tar/MD5E-s77814784--21d915740e64e08ccf966947c51eae95.tar

View file

@ -0,0 +1 @@
{"id":"705094a41713537ec5205e79423114633a7225bae388e7ba823d92126c6b36c0","parent":"360338cd2a802f4812f06fbc50237a42bc0303390efa7fa321c381e6ec36d1ae","created":"2023-10-11T17:49:59.781470605Z","container":"9af7d11daf0f3c7600377e597fd05382d2ba0c4f18bcef222764e52fcff85a42","container_config":{"Hostname":"","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["/bin/sh","-c","DEBIAN_FRONTEND=noninteractive apt-get update -qq -y --allow-releaseinfo-change \u0026\u0026 apt-get install -q --no-install-recommends -y make \u0026\u0026 apt-get install -q --no-install-recommends -y build-essential python3-dev \u0026\u0026 apt-get install -q --no-install-recommends -y python3-virtualenv python3-wheel python3-scipy python3-sklearn python3-statsmodels python3-pyparsing python3-pil python3-pip \u0026\u0026 python3 -m pip install --break-system-packages numpy==1.24.3 pandas==1.5.3 seaborn==0.10.1 matplotlib==3.4.3 \u0026\u0026 apt-get install -q --no-install-recommends -y inkscape latexmk texlive-latex-extra \u0026\u0026 rm -rf /root/.local /root/.cache /var/lib/apt/lists/deb.debian.org* ; apt-get purge -y build-essential ; apt-get autoremove -y ; apt-get clean"],"Image":"sha256:b2ac1dc434409bbcafb2aad10224409b65bacd2e15a42ca45f545ca52fdd9c00","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"docker_version":"20.10.25+dfsg1","config":{"Hostname":"","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["bash"],"Image":"sha256:b2ac1dc434409bbcafb2aad10224409b65bacd2e15a42ca45f545ca52fdd9c00","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"architecture":"amd64","os":"linux"}

View file

@ -0,0 +1 @@
../../../.git/annex/objects/4j/Gp/MD5E-s1750877184--7999b6f62ecdddb6cdabe380bd4a106f.tar/MD5E-s1750877184--7999b6f62ecdddb6cdabe380bd4a106f.tar

View file

@ -0,0 +1 @@
{"architecture":"amd64","config":{"Hostname":"","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["bash"],"Image":"sha256:b2ac1dc434409bbcafb2aad10224409b65bacd2e15a42ca45f545ca52fdd9c00","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"container":"9af7d11daf0f3c7600377e597fd05382d2ba0c4f18bcef222764e52fcff85a42","container_config":{"Hostname":"","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["/bin/sh","-c","DEBIAN_FRONTEND=noninteractive apt-get update -qq -y --allow-releaseinfo-change \u0026\u0026 apt-get install -q --no-install-recommends -y make \u0026\u0026 apt-get install -q --no-install-recommends -y build-essential python3-dev \u0026\u0026 apt-get install -q --no-install-recommends -y python3-virtualenv python3-wheel python3-scipy python3-sklearn python3-statsmodels python3-pyparsing python3-pil python3-pip \u0026\u0026 python3 -m pip install --break-system-packages numpy==1.24.3 pandas==1.5.3 seaborn==0.10.1 matplotlib==3.4.3 \u0026\u0026 apt-get install -q --no-install-recommends -y inkscape latexmk texlive-latex-extra \u0026\u0026 rm -rf /root/.local /root/.cache /var/lib/apt/lists/deb.debian.org* ; apt-get purge -y build-essential ; apt-get autoremove -y ; apt-get clean"],"Image":"sha256:b2ac1dc434409bbcafb2aad10224409b65bacd2e15a42ca45f545ca52fdd9c00","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"created":"2023-10-11T17:49:59.781470605Z","docker_version":"20.10.25+dfsg1","history":[{"created":"2023-09-20T04:55:40.815490991Z","created_by":"/bin/sh -c #(nop) ADD file:a1398394375faab8dd9e1e8d584eea96c750fb57ae4ffd2b14624f1cf263561b in / "},{"created":"2023-09-20T04:55:41.120367778Z","created_by":"/bin/sh -c #(nop) CMD [\"bash\"]","empty_layer":true},{"created":"2023-10-11T17:49:59.781470605Z","created_by":"/bin/sh -c DEBIAN_FRONTEND=noninteractive apt-get update -qq -y --allow-releaseinfo-change \u0026\u0026 apt-get install -q --no-install-recommends -y make \u0026\u0026 apt-get install -q --no-install-recommends -y build-essential python3-dev \u0026\u0026 apt-get install -q --no-install-recommends -y python3-virtualenv python3-wheel python3-scipy python3-sklearn python3-statsmodels python3-pyparsing python3-pil python3-pip \u0026\u0026 python3 -m pip install --break-system-packages numpy==1.24.3 pandas==1.5.3 seaborn==0.10.1 matplotlib==3.4.3 \u0026\u0026 apt-get install -q --no-install-recommends -y inkscape latexmk texlive-latex-extra \u0026\u0026 rm -rf /root/.local /root/.cache /var/lib/apt/lists/deb.debian.org* ; apt-get purge -y build-essential ; apt-get autoremove -y ; apt-get clean"}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:d310e774110ab038b30c6a5f7b7f7dd527dbe527854496bd30194b9ee6ea496e","sha256:e2728fc6d2c404f7b41e0fa4f889117090f4476eefab2bca48d7164dcbf7a0cb"]}}

View file

@ -0,0 +1 @@
[{"Config":"f881bd4db45ac9775f5a5377485a7c939fea4685d7482eed4809cb83fc3b51a3.json","RepoTags":["remodnav:latest"],"Layers":["360338cd2a802f4812f06fbc50237a42bc0303390efa7fa321c381e6ec36d1ae/layer.tar","705094a41713537ec5205e79423114633a7225bae388e7ba823d92126c6b36c0/layer.tar"]}]

View file

@ -0,0 +1 @@
{"remodnav":{"latest":"705094a41713537ec5205e79423114633a7225bae388e7ba823d92126c6b36c0"}}

1
img/.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
* annex.largefiles=nothing

View file

@ -199,16 +199,16 @@ z
<g id="patch_23">
<path clip-path="url(#p2f9441ee18)" d="M 157.6125 118.304175
L 163.1925 118.304175
L 163.1925 117.311604
L 157.6125 117.311604
L 163.1925 117.460043
L 157.6125 117.460043
z
" style="fill:#808080;"/>
</g>
<g id="patch_24">
<path clip-path="url(#p2f9441ee18)" d="M 163.1925 118.304175
L 168.7725 118.304175
L 168.7725 117.560194
L 163.1925 117.560194
L 168.7725 117.411756
L 163.1925 117.411756
z
" style="fill:#808080;"/>
</g>

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After