ADD: divided application and configuration directory

This commit is contained in:
Dominik Meyer 2021-06-05 12:56:42 +02:00
parent 3d76ff1ca8
commit b98fdcfd76
No known key found for this signature in database
GPG Key ID: B4C312B600606B64
2 changed files with 34 additions and 7 deletions

View File

@ -1,5 +1,5 @@
FROM php:7-apache-buster FROM php:7-apache-buster
WORKDIR /home/ WORKDIR /var/www/html
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
@ -11,12 +11,9 @@ 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 intl && docker-php-ext-enable intl
RUN docker-php-ext-install zip && docker-php-ext-enable zip RUN docker-php-ext-install zip && docker-php-ext-enable zip
RUN docker-php-ext-install ldap && docker-php-ext-enable ldap RUN docker-php-ext-install ldap && docker-php-ext-enable ldap
RUN wget -O wikindx.tar.bz2 https://phoenixnap.dl.sourceforge.net/project/wikindx/6.4.9/wikindx_6.4.9.tar.bz2
RUN tar jxf wikindx.tar.bz2
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/
RUN chown www-data.www-data wikindx -R
RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini 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/post_max_size.=.*/post_max_size = 100M/' /usr/local/etc/php/php.ini
@ -27,4 +24,6 @@ RUN echo "mysqli.default_socket = /var/run/mysqld/mysqld.sock" >> /usr/local/etc
VOLUME ["/var/lib/mysql"] VOLUME ["/var/lib/mysql"]
VOLUME ["/home/wikindx"] 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
ENTRYPOINT ["docker-entrypoint-wikindx"] ENTRYPOINT ["docker-entrypoint-wikindx"]

View File

@ -7,9 +7,37 @@ if [ ! -d /var/lib/mysql/wikindx6 ] ; then
mysql -u root < create.sql mysql -u root < create.sql
fi fi
if [ ! -d /var/www/html/wikindx ]; then
mv /home/wikindx /var/www/html/ # 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 chown -R www-data.www-data /var/www/html/wikindx
echo "created"
fi fi
docker-php-entrypoint apache2-foreground docker-php-entrypoint apache2-foreground