chaos/docker-images
2
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

grav

Browse Source
This commit is contained in:
Udo Waechter
2020-11-08 10:45:46 +01:00
parent 54a80d25d9
commit 2224fc50c8
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/web/grav/Dockerfile
View File

@@ -6,15 +6,15 @@ ARG DEV_PKGS="zlib1g-dev libpng-dev libjpeg-dev libfreetype6-dev \
libcurl4-gnutls-dev libxml2-dev libonig-dev" libcurl4-gnutls-dev libxml2-dev libonig-dev"
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y imagemagick git bash procps wget unzip dumb-init \ apt-get install -y git bash procps wget unzip supervisor \
php-fpm php-gd php-json php-curl php-dom php-xml php-yaml php-apcu \ php-fpm php-gd php-json php-curl php-dom php-xml php-yaml php-apcu \
php-opcache php-simplexml php-zip php-mbstring \ php-opcache php-simplexml php-zip php-mbstring cron \
&& mkdir /var/www \ && mkdir /var/www \
&& chown www-data:www-data /var/www \ && chown www-data:www-data /var/www \
&& cd /var/www && cd /var/www
# CLeanup # CLeanup
RUN apt-get remove -y --purge ${DEV_PKGS} && \ RUN apt-get remove -y --purge ${DEV_PKGS} exim4* && \
apt-get autoremove --purge -y && \ apt-get autoremove --purge -y && \
apt-get clean -y && \ apt-get clean -y && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
@@ -24,8 +24,11 @@ RUN mkdir /run/php && \
chown www-data:www-data /var/log /run/php && \ chown www-data:www-data /var/log /run/php && \
mkdir -p /etc/php/7.3/fpm/pool.d mkdir -p /etc/php/7.3/fpm/pool.d
ADD docker-entrypoint.sh / ADD docker-entrypoint.sh /
ADD supervisor.conf /etc/supervisor.conf
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]
USER www-data #USER www-data
CMD ["dumb-init", "/usr/sbin/php-fpm7.3", "--nodaemonize", "--force-stderr"] RUN (crontab -l; echo "* * * * * cd /var/www/grav;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab -u www-data -
#CMD ["dumb-init", "/usr/sbin/php-fpm7.3", "--nodaemonize", "--force-stderr"]
CMD ["supervisord", "-c", "/etc/supervisor.conf"]

1
apps/web/grav/deployment.yaml
View File

@@ -47,6 +47,7 @@ spec:
- >- - >-
wget -O /grav.zip "https://getgrav.org/download/core/grav-admin/latest" && wget -O /grav.zip "https://getgrav.org/download/core/grav-admin/latest" &&
unzip -q /grav.zip && unzip -q /grav.zip &&
rm -rf grav-admin/user/pages/* &&
cp -ru grav-admin/* /workdir/ && cp -ru grav-admin/* /workdir/ &&
rm -rf /grav.zip && rm -rf /grav.zip &&
rm -rf /grav-admin && rm -rf /grav-admin &&

14
apps/web/grav/supervisor.conf Normal file
View File

@@ -0,0 +1,14 @@
[supervisord]
nodaemon=true
[program:cron]
command=/usr/sbin/cron
killasgroup=true
stopasgroup=true
redirect_stderr=true
user=root
[program:php-fpm]
command=/usr/sbin/php-fpm7.3 --nodaemonize --force-stderr
user=www-data