From bb1e9f80c3d7539d1ef42566405568bba6d383da Mon Sep 17 00:00:00 2001 From: "Nick Barendregt (Msc.)" Date: Fri, 3 Nov 2017 16:56:24 +0100 Subject: [PATCH 1/2] Fixes issue #379 docker build fails, added symlink needed in build, moved cowsay comment out of last line, due to error in newer docker releases --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9086e3b7..974d4656 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,6 +63,7 @@ RUN service mysql restart && \ echo "echo hhvm" > /bin/phpenv && chmod +x /bin/phpenv && \ cd /var/www/html && \ chmod +x before_install.sh && \ + ln -s /var/www/passman /var/www/html/passman && \ sleep 1 && \ /bin/bash -c "./before_install.sh passman master mysql; exit 0" && \ mv /var/www/server/* /var/www/html/ && \ @@ -85,6 +86,7 @@ EXPOSE 80 EXPOSE 443 ENTRYPOINT service mysql start && \ service apache2 start && \ - #/usr/games/cowsay -f dragon.cow "you might now login using username:admin password:admin" && \ bash -c "trap 'echo stopping services...; service apache2 stop && service mysql stop && exit 0' SIGTERM SIGKILL; \ tail -f /var/www/html/data/nextcloud.log" + +#/usr/games/cowsay -f dragon.cow "you might now login using username:admin password:admin" && \ From 35ebbbc8cd60a7d5e37a11bd03b8c34c658cec64 Mon Sep 17 00:00:00 2001 From: "Nick Barendregt (Msc.)" Date: Sat, 4 Nov 2017 22:04:31 +0100 Subject: [PATCH 2/2] Fixes error #379, try2, removed cowsay comment to prevent error in next docker releases --- Dockerfile | 102 +++++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/Dockerfile b/Dockerfile index 974d4656..a35c379b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,29 +19,29 @@ FROM ubuntu:16.04 RUN /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" && \ - /bin/bash -c "debconf-set-selections <<< 'mariadb-server-10.0 mysql-server/root_password password PASS'" && \ - /bin/bash -c "debconf-set-selections <<< 'mariadb-server-10.0 mysql-server/root_password_again password PASS'" && \ - apt-get -y update && apt-get install -y \ - apache2 \ - cowsay \ - cowsay-off \ - git \ - curl \ - libapache2-mod-php7.0 \ - mariadb-server \ - php7.0 \ - php7.0-mysql \ - php-curl \ - php-dompdf \ - php-gd \ - php-mbstring \ - php-xml \ - php-xml-serializer \ - php-zip \ - wget + /bin/bash -c "debconf-set-selections <<< 'mariadb-server-10.0 mysql-server/root_password password PASS'" && \ + /bin/bash -c "debconf-set-selections <<< 'mariadb-server-10.0 mysql-server/root_password_again password PASS'" && \ + apt-get -y update && apt-get install -y \ + apache2 \ + cowsay \ + cowsay-off \ + git \ + curl \ + libapache2-mod-php7.0 \ + mariadb-server \ + php7.0 \ + php7.0-mysql \ + php-curl \ + php-dompdf \ + php-gd \ + php-mbstring \ + php-xml \ + php-xml-serializer \ + php-zip \ + wget + RUN a2enmod ssl 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 ./controller/ /var/www/passman/controller/ ADD ./css/ /var/www/passman/css/ @@ -54,39 +54,41 @@ ADD ./middleware /var/www/passman/middleware ADD ./templates/* /var/www/passman/templates/ COPY ./*.md /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 && \ - mysql -uroot -pPASS -e "SET PASSWORD = PASSWORD('');" && \ - sed -i '0,/.*SSLCertificateChainFile.*/s/.*SSLCertificateChainFile.*/SSLCertificateChainFile \/etc\/ssl\/private\/fullchain.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 && \ - echo "echo hhvm" > /bin/phpenv && chmod +x /bin/phpenv && \ - cd /var/www/html && \ - chmod +x before_install.sh && \ - ln -s /var/www/passman /var/www/html/passman && \ - sleep 1 && \ - /bin/bash -c "./before_install.sh passman master mysql; exit 0" && \ - mv /var/www/server/* /var/www/html/ && \ - cd /var/www/html/ && \ - chmod +x occ && \ - service mysql restart && \ - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database mysql --database-pass 'owncloud' && \ - ./occ check && \ - ./occ status && \ - ./occ app:list && \ - ./occ app:enable passman && \ - ./occ upgrade && \ - ./occ config:system:set defaultapp --value=passman && \ - ./occ config:system:set appstoreenabled --value=false && \ - ./occ config:system:set trusted_domains 2 --value=172.17.0.2 && \ - ./occ config:system:set trusted_domains 3 --value=passman.cc && \ - ./occ config:system:set trusted_domains 4 --value=demo.passman.cc && \ - chown -R www-data /var/www + mysql -uroot -pPASS -e "SET PASSWORD = PASSWORD('');" && \ + sed -i '0,/.*SSLCertificateChainFile.*/s/.*SSLCertificateChainFile.*/SSLCertificateChainFile \/etc\/ssl\/private\/fullchain.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 && \ + echo "echo hhvm" > /bin/phpenv && chmod +x /bin/phpenv && \ + cd /var/www/passman && \ + chmod +x before_install.sh && \ + sleep 1 && \ + /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/ && \ + cd /var/www/html/ && \ + chmod +x occ && \ + service mysql restart && \ + ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database mysql --database-pass 'owncloud' && \ + ./occ check && \ + ./occ status && \ + ./occ app:list && \ + ./occ app:enable passman && \ + ./occ upgrade && \ + ./occ config:system:set defaultapp --value=passman && \ + ./occ config:system:set appstoreenabled --value=false && \ + ./occ config:system:set trusted_domains 2 --value=172.17.0.2 && \ + ./occ config:system:set trusted_domains 3 --value=passman.cc && \ + ./occ config:system:set trusted_domains 4 --value=demo.passman.cc && \ + chown -R www-data /var/www EXPOSE 80 EXPOSE 443 ENTRYPOINT service mysql start && \ - service apache2 start && \ - bash -c "trap 'echo stopping services...; service apache2 stop && service mysql stop && exit 0' SIGTERM SIGKILL; \ - tail -f /var/www/html/data/nextcloud.log" + service apache2 start && \ + bash -c "trap 'echo stopping services...; service apache2 stop && service mysql stop && exit 0' SIGTERM SIGKILL; \ + tail -f /var/www/html/data/nextcloud.log" #/usr/games/cowsay -f dragon.cow "you might now login using username:admin password:admin" && \ +