Commit f23d4bf2 authored by Dave Lane's avatar Dave Lane

tokenised sample yml file

parents f89405cb b7bae90d
version: "2" version: "3"
services: services:
redis: redis:
image: redis:3-alpine image: redis:4-alpine
restart:
unless-stopped
networks:
default:
aliases:
- redis.[grav.local]
app: app:
image: kiwilightweight/grav image: kiwilightweight/grav
links:
- redis
volumes: volumes:
- [PATH_TO_YOUR_GRAV]:/var/www/html - [path-to-my-grav-data]:/var/www/html
restart: restart:
unless-stopped unless-stopped
networks: networks:
default: default:
aliases: aliases:
- [YOUR_GRAV_DOMAIN] - [grav.local]
nginx: nginx:
image: oeru/nginx-jessie image: oeru/nginx-jessie
links: links:
- app - app
- redis - redis
ports: ports:
- "127.0.0.1:8080:80" - "127.0.0.1:8081:80"
volumes: volumes:
- ./nginx:/etc/nginx/conf.d - ./nginx:/etc/nginx/conf.d
- ./nginx/cache:/var/cache/nginx - ./nginx/cache:/var/cache/nginx
- [PATH_TO_YOUR_GRAV]:/var/www/html - [path-to-my-grav-data]:/var/www/html
restart: unless-stopped restart: unless-stopped
networks:
default:
aliases:
- nginx.[grav.local]
version: "3"
services:
redis:
image: redis:3-alpine
restart:
unless-stopped
networks:
default:
aliases:
- redis.grav.stampy
app:
image: kiwilightweight/grav
links:
- redis
volumes:
- /home/data/nzoss/grav:/var/www/html
restart:
unless-stopped
networks:
default:
aliases:
- grav.stampy
nginx:
image: oeru/nginx-jessie
links:
- app
- redis
ports:
- "127.0.0.1:8080:80"
volumes:
- ./nginx:/etc/nginx/conf.d
- ./nginx/cache:/var/cache/nginx
- /home/data/nzoss/grav:/var/www/html
restart: unless-stopped
networks:
default:
aliases:
- nginx.grav.stampy
...@@ -38,5 +38,19 @@ server { ...@@ -38,5 +38,19 @@ server {
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
} }
client_max_body_size 100m; client_max_body_size 100m;
<<<<<<< HEAD
## Begin - Security
# deny all direct access for these folders
location ~* /(\.git|cache|bin|logs|backups)/.*$ { return 403; }
# deny running scripts inside core system folders
location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
# deny running scripts inside user folder
location ~* /user/.*\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
# deny access to specific files in the root folder
location ~ /(LICENSEi\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) { return 403; }
## End - Security
=======
## End - PHP ## End - PHP
>>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535
} }
FROM php:7-fpm-stretch FROM php:7-fpm
MAINTAINER Dave Lane <dave@oerfoundation.org> (@lightweight) MAINTAINER Dave Lane <dave@oerfoundation.org> (@lightweight)
RUN apt-get update && apt-get install -y software-properties-common apt-utils RUN apt-get update && apt-get install -y software-properties-common apt-utils
...@@ -11,13 +11,14 @@ RUN apt-get update && apt-get install -y apt-utils git less libbz2-dev libc-clie ...@@ -11,13 +11,14 @@ RUN apt-get update && apt-get install -y apt-utils git less libbz2-dev libc-clie
libpspell-dev libssl-dev libxml2-dev telnet unzip zip libpspell-dev libssl-dev libxml2-dev telnet unzip zip
RUN apt-get install -y net-tools vim dnsutils RUN apt-get install -y net-tools vim dnsutils
# install cron and msmtp for outgoing email # install cron and msmtp for outgoing email
RUN apt-get install -y cron msmtp RUN apt-get install -y cron msmtp sudo
RUN docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos RUN docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos
# RUN docker-php-ext-install bz2 curl imap intl mbstring mcrypt \
RUN docker-php-ext-install bz2 curl imap intl mbstring \ RUN docker-php-ext-install bz2 curl imap intl mbstring \
pspell opcache soap xmlrpc zip pspell opcache soap xmlrpc zip
# install PHPRedis # install PHPRedis
ENV PHPREDIS_VERSION 3.1.4 ENV PHPREDIS_VERSION 4.1.1
RUN docker-php-source extract \ RUN docker-php-source extract \
&& curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz \ && curl -L -o /tmp/redis.tar.gz https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz \
&& tar xfz /tmp/redis.tar.gz \ && tar xfz /tmp/redis.tar.gz \
...@@ -32,6 +33,9 @@ RUN apt-get update && apt-get install -y \ ...@@ -32,6 +33,9 @@ RUN apt-get update && apt-get install -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng-dev \ libpng-dev \
<<<<<<< HEAD
=======
# && docker-php-ext-install -j$(nproc) iconv mcrypt \
&& docker-php-ext-install -j$(nproc) iconv \ && docker-php-ext-install -j$(nproc) iconv \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j$(nproc) gd && docker-php-ext-install -j$(nproc) gd
...@@ -71,7 +75,7 @@ RUN set -ex \ ...@@ -71,7 +75,7 @@ RUN set -ex \
} | tee /usr/local/etc/php/conf.d/php.ini } | tee /usr/local/etc/php/conf.d/php.ini
# the PHP-fpm configuration - create new www.conf file! # the PHP-fpm configuration - create new www.conf file!
RUN set -ex \ RUN set -ex \
&& { \ && { \
echo '[global]'; \ echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \ echo 'error_log = /proc/self/fd/2'; \
...@@ -92,7 +96,6 @@ RUN set -ex \ ...@@ -92,7 +96,6 @@ RUN set -ex \
echo 'pm.max_spare_servers = 3'; \ echo 'pm.max_spare_servers = 3'; \
} | tee /usr/local/etc/php-fpm.d/www.conf } | tee /usr/local/etc/php-fpm.d/www.conf
VOLUME /var/www/html VOLUME /var/www/html
# Copy init scripts and custom .htaccess # Copy init scripts and custom .htaccess
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment