Skip to content

Commit dc7a9e9

Browse files
committed
work around... + replace bin/sh by bin/bash
1 parent c833d9a commit dc7a9e9

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

docker/Dockerfile-base

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ RUN apt-get update -qqy \
7474
&& echo " amqp.cfg" >> buildout.cfg \
7575
&& echo " ldap.cfg" >> buildout.cfg \
7676
&& echo " docker.cfg" >> buildout.cfg \
77-
&& su -c "virtualenv -p python2 ." -s /bin/sh imio \
78-
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \
79-
&& su -c "bin/buildout -t 30 -N" -s /bin/sh imio \
77+
&& su -c "virtualenv -p python2 ." -s /bin/bash imio \
78+
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/bash imio \
79+
&& su -c "bin/buildout -t 30 -N" -s /bin/bash imio \
8080
&& rm -rf develop-eggs/ src/ var/blobstorage/ var/filestorage/ parts/instance? bin/instance?
8181

8282
FROM imiobe/plone-base:4.3.20-ubuntu
@@ -120,7 +120,7 @@ RUN apt-get update \
120120
&& apt-get purge libreoffice-gnome libreoffice-gtk* libreoffice-help* libreoffice-kde* \
121121
&& rm -rf /var/lib/apt/lists/* \
122122
&& gem install docsplit \
123-
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \
123+
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/bash imio \
124124
&& chmod +x /plone/*.sh
125125

126126
USER imio

docker/Dockerfile-demo

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ RUN apt-get update \
6666
&& echo " ldap.cfg" >> buildout.cfg \
6767
&& echo " docker.cfg" >> buildout.cfg \
6868
&& sed -ie "s#Products.MeetingCommunes:zcity#Products.MeetingCommunes:demo#" *.cfg \
69-
&& su -c "virtualenv -p python2 ." -s /bin/sh imio \
70-
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \
71-
&& su -c "bin/buildout -t 30 -N" -s /bin/sh imio \
69+
&& su -c "virtualenv -p python2 ." -s /bin/bash imio \
70+
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/bash imio \
71+
&& su -c "bin/buildout -t 30 -N" -s /bin/bash imio \
72+
&& su -c "curl -fso bin/run_script.py https://raw.githubusercontent.com/IMIO/imio.updates/master/src/imio/updates/run_script.py" -s /bin/bash imio \
7273
&& rm -rf develop-eggs/ src/ var/blobstorage/ var/filestorage/ parts/instance? bin/instance?
7374

7475
FROM imiobe/iadelib:base

docker/Dockerfile-dev

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ RUN sed -i "s/\${buildout:directory}\/var/\/data/g" *.cfg \
5151
&& echo " ldap.cfg" >> buildout.cfg \
5252
&& echo " docker-dev.cfg" >> buildout.cfg \
5353
&& sed -ie "s#Products.MeetingCommunes:zcity#Products.MeetingCommunes:demo#" base.cfg \
54-
&& su -c "virtualenv -p python2 ." -s /bin/sh imio \
55-
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \
56-
&& su -c "bin/buildout -t 30 -N" -s /bin/sh imio \
54+
&& su -c "virtualenv -p python2 ." -s /bin/bash imio \
55+
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/bash imio \
56+
&& su -c "bin/buildout -t 30 -N" -s /bin/bash imio \
5757
&& rm -rf develop-eggs/ var/blobstorage/ var/filestorage/
5858

5959
USER imio

docker/Dockerfile-latest

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ RUN apt-get update \
6565
&& echo " amqp.cfg" >> buildout.cfg \
6666
&& echo " ldap.cfg" >> buildout.cfg \
6767
&& echo " docker.cfg" >> buildout.cfg \
68-
&& su -c "virtualenv -p python2 ." -s /bin/sh imio \
69-
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/sh imio \
70-
&& su -c "bin/buildout -t 30 -N" -s /bin/sh imio \
68+
&& su -c "virtualenv -p python2 ." -s /bin/bash imio \
69+
&& su -c "bin/pip install 'python-ldap==2.4.15' -r requirements.txt" -s /bin/bash imio \
70+
&& su -c "bin/buildout -t 30 -N" -s /bin/bash imio \
71+
&& su -c "curl -fso bin/run_script.py https://raw.githubusercontent.com/IMIO/imio.updates/master/src/imio/updates/run_script.py" -s /bin/bash imio \
7172
&& rm -rf develop-eggs/ src/ var/blobstorage/ var/filestorage/ parts/instance? bin/instance?
7273

7374
FROM imiobe/iadelib:base

0 commit comments

Comments
 (0)