Compare commits

..

No commits in common. "master" and "2e3e7f7630bf79ad22acb90e75e3f38532bdec29" have entirely different histories.

2 changed files with 73 additions and 41 deletions

View File

@ -11,19 +11,84 @@ RUN docker-php-ext-install gettext && docker-php-ext-enable gettext
RUN docker-php-ext-install intl && docker-php-ext-enable intl
RUN docker-php-ext-install zip && docker-php-ext-enable zip
RUN docker-php-ext-install ldap && docker-php-ext-enable ldap
RUN wget -O wikindx.tar.bz2 https://sourceforge.net/projects/wikindx/files/latest/download
RUN tar jxf wikindx.tar.bz2
WORKDIR /tmp
RUN wget -O wikindx_plugin_visualize_344.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_plugin_visualize_344.tar.gz/download
RUN wget -O wikindx_plugin_userwritecategory_344.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_plugin_userwritecategory_344.tar.gz/download
RUN wget -O wikindx_plugin_importexportbib_344.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_plugin_importexportbib_344.tar.gz/download
RUN wget -O wikindx_plugin_wordprocessor_344.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_plugin_wordprocessor_344.tar.gz/download
RUN wget -O wikindx_vendor_tinymce_235.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_tinymce_235.tar.gz/download
RUN wget -O wikindx_vendor_smarty_223.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_smarty_223.tar.gz/download
RUN wget -O wikindx_vendor_rtftools_337.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_rtftools_337.tar.gz/download
RUN wget -O wikindx_vendor_phpmailer_337.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_phpmailer_337.tar.gz/download
RUN wget -O wikindx_vendor_progressbarjs_175.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_progressbarjs_175.tar.gz/download
RUN wget -O wikindx_vendor_pdftotext_175.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_pdftotext_175.tar.gz/download
RUN wget -O wikindx_vendor_licenses_191.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_licenses_191.tar.gz/download
RUN wget -O wikindx_vendor_jquery_175.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_jquery_175.tar.gz/download
RUN wget -O wikindx_vendor_jsonjs_175.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_vendor_jsonjs_175.tar.gz/download
RUN wget -O wikindx_template_verticalorange_235.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_template_verticalorange_235.tar.gz/download
RUN wget -O wikindx_template_simpleblue_250.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_template_simpleblue_250.tar.gz/download
RUN wget -O wikindx_template_piaf_250.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_template_piaf_250.tar.gz/download
RUN wget -O wikindx_template_enluminure_235.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_template_enluminure_235.tar.gz/download
RUN wget -O wikindx_template_default_337.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_template_default_337.tar.gz/download
RUN wget -O wikindx_template_carambola_250.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_template_carambola_250.tar.gz/download
RUN wget -O wikindx_template_bryophyta_250.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_template_bryophyta_250.tar.gz/download
RUN wget -O wikindx_style_mla_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_mla_213.tar.gz/download
RUN wget -O wikindx_style_turabian_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_turabian_213.tar.gz/download
RUN wget -O wikindx_style_wikindx_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_wikindx_213.tar.gz/download
RUN wget -O wikindx_style_cfb_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_cfb_213.tar.gz/download
RUN wget -O wikindx_style_chicago_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_chicago_213.tar.gz/download
RUN wget -O wikindx_style_harvard_213.tar.gz https://sourceforge.net/projects/wikindx/files/current_release/components/wikindx_style_harvard_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_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 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
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
RUN tar zxf /tmp/wikindx_vendor_phpmailer_337.tar.gz
RUN tar zxf /tmp/wikindx_vendor_progressbarjs_175.tar.gz
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
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
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
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
RUN tar zxf /tmp/wikindx_style_cfb_213.tar.gz
RUN tar zxf /tmp/wikindx_style_chicago_213.tar.gz
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
RUN cp wikindx/config.php.dist wikindx/config.php
COPY create.sql .
COPY docker-entrypoint-wikindx /usr/local/bin/
RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
RUN sed -i 's/post_max_size.=.*/post_max_size = 100M/' /usr/local/etc/php/php.ini
RUN sed -i 's/upload_max_filesize.=.*/upload_max_filesize = 100M/' /usr/local/etc/php/php.ini
RUN chown www-data.www-data wikindx -R
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 ["/home/wikindx"]
RUN wget -O wikindx.tar.bz2 https://phoenixnap.dl.sourceforge.net/project/wikindx/6.4.9/wikindx_6.4.9.tar.bz2;tar jxf wikindx.tar.bz2
VOLUME ["/var/www/html/wikindx"]
ENTRYPOINT ["docker-entrypoint-wikindx"]

View File

@ -7,37 +7,4 @@ if [ ! -d /var/lib/mysql/wikindx6 ] ; then
mysql -u root < create.sql
fi
# for updating from old docker container
if [ -e /home/wikindx/index.php ]; then
echo -n "found application in config directory ..."
mv /home/wikindx/config.php /tmp/
rm /home/wikindx/* -rf
mv /tmp/config.php /home/wikindx/config.php
chown -R www-data.www-data /home/wikindx
echo "removed"
fi
# make sure a configuration file exists
if [ ! -e /home/wikindx/config.php ]; then
echo "no configuration file yet exist ..."
cp /var/www/html/config.php.dist /home/wikindx/config.php
chown -R www-data.www-data /home/wikindx
echo "created"
fi
# make sure application is unpacked
if [ ! -e /var/www/html/wikindx/index.php ]; then
cd /var/www/html
tar jxf wikindx.tar.bz2
fi
# make sure configuration file is linked to application directory
if [ ! -e /var/www/html/wikindx/config.php ]; then
echo "No link to configuration found in application directory ..."
ln -s /home/wikindx/config.php /var/www/html/wikindx/config.php
chown -R www-data.www-data /var/www/html/wikindx
echo "created"
fi
docker-php-entrypoint apache2-foreground