drymer
/
dockerfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[gnusocial] Update config to match source

This commit is contained in:
drymer 2018-07-30 01:42:47 +02:00
parent cc548284ac
commit e5578ab5cd
Signed by: drymer
GPG Key ID: A307D64D5DDFDAAD
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnusocial/Dockerfile
View File

@ -9,10 +9,11 @@ RUN chmod a+w /var/www/html/ && mkdir /var/www/html/avatar && chmod a+w \
chmod a+w /var/www/html/file && mkdir -p /tmp/gnusocial && chmod \
a+w /tmp/gnusocial && mkdir -p /run/nginx/
RUN echo opcache.enable=1 >> /usr/local/etc/php.ini && sed -i \
"s/^mysqli.reconnect =.*/mysqli.reconnect = 1/" /usr/local/etc/php.ini && sed \
-i "s/pcntl_fork//;s/pcntl_wait,//;s/pcntl_wifexited,//;s/pcntl_wexitstatus,//;s/pcntl_wifsignaled,//;s/pcntl_wtermsig,//" \
/usr/local/etc/php.ini && sed -i "s/pm.max_requests = 5/pm.max_requests = 10/" /usr/local/etc/php-fpm.conf
RUN echo "opcache.enable = 1" >> /usr/local/etc/php.ini
RUN echo "pm.max_requests = 10" >> /usr/local/etc/php-fpm.conf
RUN find /var/www/html -name '*.git' | xargs rm -r && apk del git && rm -rf \
/etc/apk/cache/
COPY stuff/start.sh /opt/start.sh

10
gnusocial/Dockerfile_daemons
View File

@ -1,6 +1,6 @@
FROM php:7.2.8-fpm-alpine3.7
RUN apk update && apk add nginx git curl libpng-dev icu-dev && docker-php-ext-install intl mysqli gd
RUN apk update && apk add nginx git curl libpng-dev icu-dev && docker-php-ext-install intl mysqli gd pcntl
RUN git clone https://git.gnu.io/gnu/gnu-social.git -b nightly /var/www/html/ && apk del git
@ -9,11 +9,6 @@ RUN chmod a+w /var/www/html/ && mkdir /var/www/html/avatar && chmod a+w \
chmod a+w /var/www/html/file && mkdir -p /tmp/gnusocial && chmod \
a+w /tmp/gnusocial && mkdir -p /run/nginx/
RUN echo opcache.enable=1 >> /usr/local/etc/php.ini && sed -i \
"s/^mysqli.reconnect =.*/mysqli.reconnect = 1/" /usr/local/etc/php.ini && sed \
-i "s/pcntl_fork//;s/pcntl_wait,//;s/pcntl_wifexited,//;s/pcntl_wexitstatus,//;s/pcntl_wifsignaled,//;s/pcntl_wtermsig,//" \
/usr/local/etc/php.ini && sed -i "s/pm.max_requests = 5/pm.max_requests = 10/" /usr/local/etc/php-fpm.conf
RUN apk add -U git && git clone https://code.chromic.org/chimo/gs-reverseFavs \
/var/www/html/plugins/ReverseFavs && git clone \
https://code.chromic.org/chimo/gs-websubstates \
@ -27,6 +22,9 @@ RUN apk add -U git && git clone https://code.chromic.org/chimo/gs-reverseFavs \
https://code.chromic.org/chimo/gs-prettySimple \
/var/www/html/theme/pretty-simple
RUN echo "opcache.enable = 1" >> /usr/local/etc/php.ini
RUN echo "pm.max_requests = 10" >> /usr/local/etc/php-fpm.conf
RUN find /var/www/html -name '*.git' | xargs rm -r && apk del git && rm -rf \
/etc/apk/cache/

6
gnusocial/stuff/start.sh
View File

@ -1,14 +1,14 @@
#!/bin/sh
config_file="$WWW_ROOT/config.php"
config_file="/var/www/html/config.php"
if [ -e $config_file ]
then
startdaemons=$(grep "config\['queue'\]\['enabled'\]" $config_file | grep -i true)
if [ -n "$startdaemons" ]
then
/bin/sh $WWW_ROOT/scripts/startdaemons.sh
/bin/sh /var/www/html/scripts/startdaemons.sh
fi
rm $WWW_ROOT/install.php
rm /var/www/html/install.php
fi
nginx -c /etc/nginx/nginx.conf -g "daemon on;"