From f2daedcb8f7bba47eb309896a7bd883538784fd9 Mon Sep 17 00:00:00 2001 From: Dominik Meyer Date: Sat, 6 Feb 2021 22:00:39 +0100 Subject: [PATCH] FIX: fixed non working conf volume --- Dockerfile | 25 +++++++++++-------------- docker-entrypoint-wikindx | 4 ++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8bac002..d8649b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM php:7-apache-buster -WORKDIR /var/www/html +WORKDIR /home/ RUN sed -i 's/deb.debian.org/ftp.de.debian.org/g' /etc/apt/sources.list RUN apt-get -q -y update && apt-get -q -y upgrade RUN apt-get -q -y install default-libmysqlclient-dev wget mariadb-server @@ -43,16 +43,16 @@ RUN wget -O wikindx_style_harvard_213.tar.gz https://sourceforge.net/projects/wi RUN wget -O wikindx_style_ieee_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_ieee_213.tar.gz/download RUN wget -O wikindx_style_apa_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_apa_213.tar.gz/download RUN wget -O wikindx_style_britishmedicaljournal_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_britishmedicaljournal_213.tar.gz/download -RUN mkdir -p /var/www/html/wikindx/components/plugins -RUN mkdir -p /var/www/html/wikindx/components/vendors -RUN mkdir -p /var/www/html/wikindx/components/templates -RUN mkdir -p /var/www/html/wikindx/components/styles -WORKDIR /var/www/html/wikindx/components/plugins +RUN mkdir -p /home/wikindx/components/plugins +RUN mkdir -p /home/wikindx/components/vendors +RUN mkdir -p /home/wikindx/components/templates +RUN mkdir -p /home/wikindx/components/styles +WORKDIR /home/wikindx/components/plugins RUN tar zxf /tmp/wikindx_plugin_visualize_344.tar.gz RUN tar zxf /tmp/wikindx_plugin_userwritecategory_344.tar.gz RUN tar zxf /tmp/wikindx_plugin_importexportbib_344.tar.gz RUN tar zxf /tmp/wikindx_plugin_wordprocessor_344.tar.gz -WORKDIR /var/www/html/wikindx/components/vendors +WORKDIR /home/wikindx/components/vendors RUN tar zxf /tmp/wikindx_vendor_tinymce_235.tar.gz RUN tar zxf /tmp/wikindx_vendor_smarty_223.tar.gz RUN tar zxf /tmp/wikindx_vendor_rtftools_337.tar.gz @@ -62,7 +62,7 @@ RUN tar zxf /tmp/wikindx_vendor_pdftotext_175.tar.gz RUN tar zxf /tmp/wikindx_vendor_licenses_191.tar.gz RUN tar zxf /tmp/wikindx_vendor_jquery_175.tar.gz RUN tar zxf /tmp/wikindx_vendor_jsonjs_175.tar.gz -WORKDIR /var/www/html/wikindx/components/templates +WORKDIR /home/wikindx/components/templates RUN tar zxf /tmp/wikindx_template_verticalorange_235.tar.gz RUN tar zxf /tmp/wikindx_template_simpleblue_250.tar.gz RUN tar zxf /tmp/wikindx_template_piaf_250.tar.gz @@ -70,7 +70,7 @@ RUN tar zxf /tmp/wikindx_template_enluminure_235.tar.gz RUN tar zxf /tmp/wikindx_template_default_337.tar.gz RUN tar zxf /tmp/wikindx_template_carambola_250.tar.gz RUN tar zxf /tmp/wikindx_template_bryophyta_250.tar.gz -WORKDIR /var/www/html/wikindx/components/styles +WORKDIR /home/wikindx/components/styles RUN tar zxf /tmp/wikindx_style_mla_213.tar.gz RUN tar zxf /tmp/wikindx_style_turabian_213.tar.gz RUN tar zxf /tmp/wikindx_style_wikindx_213.tar.gz @@ -80,7 +80,7 @@ RUN tar zxf /tmp/wikindx_style_harvard_213.tar.gz RUN tar zxf /tmp/wikindx_style_ieee_213.tar.gz RUN tar zxf /tmp/wikindx_style_apa_213.tar.gz RUN tar zxf /tmp/wikindx_style_britishmedicaljournal_213.tar.gz -WORKDIR /var/www/html +WORKDIR /home RUN cp wikindx/config.php.dist wikindx/config.php COPY create.sql . COPY docker-entrypoint-wikindx /usr/local/bin/ @@ -92,10 +92,7 @@ RUN sed -i 's/upload_max_filesize.=.*/upload_max_filesize = 100M/' /usr/local/et RUN echo "mysql.default_socket = /var/run/mysqld/mysqld.sock" >> /usr/local/etc/php/conf.d/docker-php-ext-mysqli.ini RUN echo "mysqli.default_socket = /var/run/mysqld/mysqld.sock" >> /usr/local/etc/php/conf.d/docker-php-ext-mysqli.ini - - - VOLUME ["/var/lib/mysql"] -VOLUME ["/var/www/html/wikindx"] +VOLUME ["/home/wikindx"] ENTRYPOINT ["docker-entrypoint-wikindx"] diff --git a/docker-entrypoint-wikindx b/docker-entrypoint-wikindx index 6a761bd..d2033cf 100755 --- a/docker-entrypoint-wikindx +++ b/docker-entrypoint-wikindx @@ -7,4 +7,8 @@ if [ ! -d /var/lib/mysql/wikindx6 ] ; then mysql -u root < create.sql fi +if [ ! -d /var/www/html/ikindx ]; then + mv /home/wikindx /var/www/html/ +fi + docker-php-entrypoint apache2-foreground