Skip to content

Commit 73f9909

Browse files
authored
Merge pull request #156 from ReproNim/enh-container
Streamline container recipes generation: do not bother with version in the recipe name, place in the folder of the script
2 parents 720e710 + b252ad7 commit 73f9909

File tree

5 files changed

+10
-373
lines changed

5 files changed

+10
-373
lines changed

containers/repronim-reprostim/Dockerfile.repronim-reprostim-0.7.5 renamed to containers/repronim-reprostim/Dockerfile.repronim-reprostim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN apt-get update -qq \
5959
&& rm -rf /var/lib/apt/lists/*
6060
RUN git clone https://github.com/wieluk/psychopy_linux_installer/ /opt/psychopy-installer; cd /opt/psychopy-installer; git checkout tags/v1.4.3
6161
RUN /opt/psychopy-installer/psychopy_linux_installer --install-dir=/opt/psychopy --psychopy-version=2024.2.5 --additional-packages=psychopy_bids==2024.2.2 --python-version=3.10 --wxpython-version=4.2.2 -v -f
62-
RUN /opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all]==0.7.5
62+
RUN /opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all,disp_mon]==0.7.13
6363
RUN bash -c 'ln -s /opt/psychopy/psychopy_2024.2.5_py3.10/bin/psychopy /usr/local/bin/'
6464
RUN bash -c 'b=$(ls /opt/psychopy/psychopy_2024.2.5_py3.10/bin/python3); echo -e "#!/bin/sh\n$b \"\$@\"" >| /usr/local/bin/python3; chmod a+x /usr/local/bin/python3'
6565
ENTRYPOINT ["python3"]
@@ -148,7 +148,7 @@ RUN printf '{ \
148148
{ \
149149
"name": "run", \
150150
"kwds": { \
151-
"command": "/opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all]==0.7.5" \
151+
"command": "/opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all,disp_mon]==0.7.13" \
152152
} \
153153
}, \
154154
{ \

containers/repronim-reprostim/Dockerfile.repronim-reprostim-0.7.9

Lines changed: 0 additions & 176 deletions
This file was deleted.

containers/repronim-reprostim/Singularity.repronim-reprostim-0.7.5 renamed to containers/repronim-reprostim/Singularity.repronim-reprostim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ git clone https://github.com/wieluk/psychopy_linux_installer/ /opt/psychopy-inst
6868

6969
/opt/psychopy-installer/psychopy_linux_installer --install-dir=/opt/psychopy --psychopy-version=2024.2.5 --additional-packages=psychopy_bids==2024.2.2 --python-version=3.10 --wxpython-version=4.2.2 -v -f
7070

71-
/opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all]==0.7.5
71+
/opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all,disp_mon]==0.7.13
7272

7373
bash -c 'ln -s /opt/psychopy/psychopy_2024.2.5_py3.10/bin/psychopy /usr/local/bin/'
7474

@@ -158,7 +158,7 @@ printf '{ \
158158
{ \
159159
"name": "run", \
160160
"kwds": { \
161-
"command": "/opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all]==0.7.5" \
161+
"command": "/opt/psychopy/psychopy_2024.2.5_py3.10/bin/pip install reprostim[all,disp_mon]==0.7.13" \
162162
} \
163163
}, \
164164
{ \

0 commit comments

Comments
 (0)