nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-11 05:56:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixes error #379, try2, removed cowsay comment to prevent error in next docker releases

Browse source
This commit is contained in:
Nick Barendregt (Msc.) 2017-11-04 22:04:31 +01:00
parent bb1e9f80c3
commit 35ebbbc8cd
No known key found for this signature in database
GPG key ID: A1CE7399FD4E1A15
1 changed files with 52 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -39,9 +39,9 @@ RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \
php-xml-serializer \ php-xml-serializer \
php-zip \ php-zip \
wget wget
RUN a2enmod ssl RUN a2enmod ssl
RUN ln -s /etc/apache2/sites-available/default-ssl.conf /etc/apache2/sites-enabled RUN ln -s /etc/apache2/sites-available/default-ssl.conf /etc/apache2/sites-enabled
ADD https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh /var/www/html/
ADD ./appinfo/ /var/www/passman/appinfo/ ADD ./appinfo/ /var/www/passman/appinfo/
ADD ./controller/ /var/www/passman/controller/ ADD ./controller/ /var/www/passman/controller/
ADD ./css/ /var/www/passman/css/ ADD ./css/ /var/www/passman/css/
@ -54,6 +54,7 @@ ADD ./middleware /var/www/passman/middleware
ADD ./templates/* /var/www/passman/templates/ ADD ./templates/* /var/www/passman/templates/
COPY ./*.md /var/www/passman/ COPY ./*.md /var/www/passman/
COPY ./LICENSE /var/www/passman/ COPY ./LICENSE /var/www/passman/
ADD https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh /var/www/passman
RUN service mysql restart && \ RUN service mysql restart && \
mysql -uroot -pPASS -e "SET PASSWORD = PASSWORD('');" && \ mysql -uroot -pPASS -e "SET PASSWORD = PASSWORD('');" && \
@ -61,11 +62,11 @@ RUN service mysql restart && \
sed -i '0,/.*ssl-cert-snakeoil.pem.*/s/.*ssl-cert-snakeoil.pem.*/SSLCertificateFile \/etc\/ssl\/private\/cert.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \ sed -i '0,/.*ssl-cert-snakeoil.pem.*/s/.*ssl-cert-snakeoil.pem.*/SSLCertificateFile \/etc\/ssl\/private\/cert.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
sed -i '0,/.*SSLCertificateKeyFile.*/s/.*SSLCertificateKeyFile.*/SSLCertificateKeyFile \/etc\/ssl\/private\/privkey.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \ sed -i '0,/.*SSLCertificateKeyFile.*/s/.*SSLCertificateKeyFile.*/SSLCertificateKeyFile \/etc\/ssl\/private\/privkey.pem/' /etc/apache2/sites-enabled/default-ssl.conf && \
echo "echo hhvm" > /bin/phpenv && chmod +x /bin/phpenv && \ echo "echo hhvm" > /bin/phpenv && chmod +x /bin/phpenv && \
cd /var/www/html && \ cd /var/www/passman && \
chmod +x before_install.sh && \ chmod +x before_install.sh && \
ln -s /var/www/passman /var/www/html/passman && \
sleep 1 && \ sleep 1 && \
/bin/bash -c "./before_install.sh passman master mysql; exit 0" && \ /bin/bash -c "./before_install.sh passman master mysql; exit 0" && \
rm /var/www/server/apps/passman/before_install.sh && \
mv /var/www/server/* /var/www/html/ && \ mv /var/www/server/* /var/www/html/ && \
cd /var/www/html/ && \ cd /var/www/html/ && \
chmod +x occ && \ chmod +x occ && \
@ -90,3 +91,4 @@ ENTRYPOINT service mysql start && \
tail -f /var/www/html/data/nextcloud.log" tail -f /var/www/html/data/nextcloud.log"
#/usr/games/cowsay -f dragon.cow "you might now login using username:admin password:admin" && \ #/usr/games/cowsay -f dragon.cow "you might now login using username:admin password:admin" && \