Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 3d8f307

Browse files
c12simplec12simple
authored andcommitted
Update gencert and volumes
1 parent 64ba56c commit 3d8f307

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

dist/docker/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN chmod +x /etc/pre_conf_pydio.sh
2929
RUN chmod +x /etc/configure_php_modules.sh
3030

3131
# generate certificate for server
32-
RUN /etc/gencert.sh
32+
#RUN /etc/gencert.sh
3333

3434
# install some php modules
3535
RUN /etc/configure_php_modules.sh
@@ -46,8 +46,10 @@ RUN /etc/pre_conf_pydio.sh
4646
# install supervisord
4747
RUN yum install -y python-pip && pip install "pip>=1.4,<1.5" --upgrade
4848
RUN pip install supervisor
49-
VOLUME ["/var/lib/pydio"]
49+
VOLUME /var/lib/pydio
50+
VOLUME /var/lib/mysql
51+
VOLUME /etc/pki/tls
52+
VOLUME /var/cache/pydio
5053

5154
EXPOSE 443
5255
CMD ["supervisord", "-n"]
53-

dist/docker/gencert.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# generate certificate (selfsign) for apache
2+
if [ ! -f /etc/pki/tls/private/pydio.pem ]
3+
then
24
/bin/sh /etc/gencert
35
# override pydio.conf when we use SSL
46
sed -i "s/localhost.crt/pydio.csr/g" /etc/httpd/conf.d/ssl.conf
57
sed -i "s/localhost.key/pydio.pem/g" /etc/httpd/conf.d/ssl.conf
8+
9+
fi

dist/docker/supervisord.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ serverurl=http://127.0.0.1:9001
2020
[program:sshd]
2121
command = /usr/sbin/sshd -D
2222

23+
[program:generateCert]
24+
command=/bin/sh /etc/gencert.sh
25+
2326
[program:httpd]
2427
;command=/usr/sbin/httpd -c "ErrorLog /dev/stdout" -DFOREGROUND
2528
redirect_stderr=true

0 commit comments

Comments
 (0)