FIX: fixed non working conf volume

This commit is contained in:
Dominik Meyer 2021-02-06 22:00:39 +01:00
parent d1f3c3463e
commit f2daedcb8f
No known key found for this signature in database
GPG Key ID: B4C312B600606B64
2 changed files with 15 additions and 14 deletions

View File

@ -1,5 +1,5 @@
FROM php:7-apache-buster 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 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 update && apt-get -q -y upgrade
RUN apt-get -q -y install default-libmysqlclient-dev wget mariadb-server 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_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_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 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 /home/wikindx/components/plugins
RUN mkdir -p /var/www/html/wikindx/components/vendors RUN mkdir -p /home/wikindx/components/vendors
RUN mkdir -p /var/www/html/wikindx/components/templates RUN mkdir -p /home/wikindx/components/templates
RUN mkdir -p /var/www/html/wikindx/components/styles RUN mkdir -p /home/wikindx/components/styles
WORKDIR /var/www/html/wikindx/components/plugins WORKDIR /home/wikindx/components/plugins
RUN tar zxf /tmp/wikindx_plugin_visualize_344.tar.gz 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_userwritecategory_344.tar.gz
RUN tar zxf /tmp/wikindx_plugin_importexportbib_344.tar.gz RUN tar zxf /tmp/wikindx_plugin_importexportbib_344.tar.gz
RUN tar zxf /tmp/wikindx_plugin_wordprocessor_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_tinymce_235.tar.gz
RUN tar zxf /tmp/wikindx_vendor_smarty_223.tar.gz RUN tar zxf /tmp/wikindx_vendor_smarty_223.tar.gz
RUN tar zxf /tmp/wikindx_vendor_rtftools_337.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_licenses_191.tar.gz
RUN tar zxf /tmp/wikindx_vendor_jquery_175.tar.gz RUN tar zxf /tmp/wikindx_vendor_jquery_175.tar.gz
RUN tar zxf /tmp/wikindx_vendor_jsonjs_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_verticalorange_235.tar.gz
RUN tar zxf /tmp/wikindx_template_simpleblue_250.tar.gz RUN tar zxf /tmp/wikindx_template_simpleblue_250.tar.gz
RUN tar zxf /tmp/wikindx_template_piaf_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_default_337.tar.gz
RUN tar zxf /tmp/wikindx_template_carambola_250.tar.gz RUN tar zxf /tmp/wikindx_template_carambola_250.tar.gz
RUN tar zxf /tmp/wikindx_template_bryophyta_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_mla_213.tar.gz
RUN tar zxf /tmp/wikindx_style_turabian_213.tar.gz RUN tar zxf /tmp/wikindx_style_turabian_213.tar.gz
RUN tar zxf /tmp/wikindx_style_wikindx_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_ieee_213.tar.gz
RUN tar zxf /tmp/wikindx_style_apa_213.tar.gz RUN tar zxf /tmp/wikindx_style_apa_213.tar.gz
RUN tar zxf /tmp/wikindx_style_britishmedicaljournal_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 RUN cp wikindx/config.php.dist wikindx/config.php
COPY create.sql . COPY create.sql .
COPY docker-entrypoint-wikindx /usr/local/bin/ 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 "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 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/lib/mysql"]
VOLUME ["/var/www/html/wikindx"] VOLUME ["/home/wikindx"]
ENTRYPOINT ["docker-entrypoint-wikindx"] ENTRYPOINT ["docker-entrypoint-wikindx"]

View File

@ -7,4 +7,8 @@ if [ ! -d /var/lib/mysql/wikindx6 ] ; then
mysql -u root < create.sql mysql -u root < create.sql
fi fi
if [ ! -d /var/www/html/ikindx ]; then
mv /home/wikindx /var/www/html/
fi
docker-php-entrypoint apache2-foreground docker-php-entrypoint apache2-foreground