fossilfranv/monica
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't set APACHE_DOCUMENT_ROOT env variable (#23)

Browse Source
This commit is contained in:
Alexis Saettler 2020-08-26 08:13:14 +02:00 committed by GitHub
parent 1988b4de41
commit 001f54d0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.templates/Dockerfile-apache.template
View File

@ -9,8 +9,7 @@ RUN set -ex; \
} > $APACHE_CONFDIR/conf-available/remoteip.conf; \ } > $APACHE_CONFDIR/conf-available/remoteip.conf; \
a2enconf remoteip a2enconf remoteip
ENV APACHE_DOCUMENT_ROOT /var/www/html/public
RUN set -ex; \ RUN set -ex; \
\ APACHE_DOCUMENT_ROOT=/var/www/html/public; \
sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/sites-available/*.conf; \ sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/sites-available/*.conf; \
sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/apache2.conf $APACHE_CONFDIR/conf-available/*.conf sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/apache2.conf $APACHE_CONFDIR/conf-available/*.conf

5
apache/Dockerfile
View File

@ -55,7 +55,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \ pecl install memcached-3.1.5; \
pecl install redis-5.3.0; \ pecl install redis-5.3.1; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -119,9 +119,8 @@ RUN set -ex; \
} > $APACHE_CONFDIR/conf-available/remoteip.conf; \ } > $APACHE_CONFDIR/conf-available/remoteip.conf; \
a2enconf remoteip a2enconf remoteip
ENV APACHE_DOCUMENT_ROOT /var/www/html/public
RUN set -ex; \ RUN set -ex; \
\ APACHE_DOCUMENT_ROOT=/var/www/html/public; \
sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/sites-available/*.conf; \ sed -ri -e "s!/var/www/html!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/sites-available/*.conf; \
sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/apache2.conf $APACHE_CONFDIR/conf-available/*.conf sed -ri -e "s!/var/www/!${APACHE_DOCUMENT_ROOT}!g" $APACHE_CONFDIR/apache2.conf $APACHE_CONFDIR/conf-available/*.conf

2
fpm-alpine/Dockerfile
View File

@ -53,7 +53,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \ pecl install memcached-3.1.5; \
pecl install redis-5.3.0; \ pecl install redis-5.3.1; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \

2
fpm/Dockerfile
View File

@ -55,7 +55,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \ pecl install memcached-3.1.5; \
pecl install redis-5.3.0; \ pecl install redis-5.3.1; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \