From d3792a47ec01431467646b87113c44964087b44d Mon Sep 17 00:00:00 2001 From: Adek Lanin Date: Sun, 8 Jul 2018 17:03:55 +0700 Subject: [PATCH 1/2] volumes on compose file Add `volumes` that used on compose --- docker-compose.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 17b2602..5c16e41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ version: '2' -services: +services: limesurvey-nginx: image: fjudith/limesurvey:nginx volumes: @@ -33,4 +33,9 @@ services: - limesurvey-data:/var/www/html links: - limesurvey-md:mysql - - limesurvey-mc:memcached \ No newline at end of file + - limesurvey-mc:memcached + +volumes: + limesurvey-data: + limesurvey-db: + limesurvey-upload: \ No newline at end of file From 9422b020487da9b7c6bb6ebfd4785a26d5f6f258 Mon Sep 17 00:00:00 2001 From: Adek Lanin Date: Sun, 8 Jul 2018 17:08:24 +0700 Subject: [PATCH 2/2] Fixes: typo, variables, volumes usage & declaration --- README.md | 109 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index 13c5d19..37993d7 100644 --- a/README.md +++ b/README.md @@ -150,54 +150,67 @@ limesurvey: Runs inside `php-fpm` linked to `memchaced` and `nginx` external containers. ```yaml -limesurvey-md: - image: mariadb - restart: always - ports: - - "32805:3306" - environment: - MYSQL_DATABASE: limesurvey - MYSQL_ROOT_PASSWORD: V3rY1ns3cur3P4ssw0rd - MYSQL_USER: limesurvey - MYSQL_PASSWORD: V3rY1ns3cur3P4ssw0rd - volumes: - - limesurvey-db:/var/lib/mysql - - limesurvey-dblog:/var/log/mysql - - limeservey-dbetc:/etc/mysql - -limesurvey-mc: - image: memcached - -limesurvey: - image: fjudith/limesurvey:fpm - restart: always - environement: - MEMCACHED_HOST: memcached - PUBLIC_URL: http://survey.example.loc - SMTP_HOST: smtp.example.com - SMTP_TLS: on - SMTP_PORT: 465 - SMTP_AUTH: off - MAIL_FROM_DEFAULT: no-reply@example.com - MAIL_DOMAIN: mail.example.com - volumes: - - limesurvey-upload:/var/www/html/upload - links: - - limesurvey-md:mysql - - limesruvey-pc:memcached - -limesurvey-nginx: - image: fjudith/limesurvey:nginx - ports: - - 32706:8443/tcp - - 32705:8080/tcp - links: - - limesurvey-mc:memcached - - limesurvey:limesurvey - volumes: - - limesurvey-data:/var/www/html - - limesurvey-nginx-config:/etc/nginx - - limesurvey-nginx-log:/var/log/nginx +version: '2' + +services: + + limesurvey-md: + image: mariadb + restart: always + ports: + - "32805:3306" + environment: + MYSQL_DATABASE: limesurvey + MYSQL_ROOT_PASSWORD: V3rY1ns3cur3P4ssw0rd + MYSQL_USER: limesurvey + MYSQL_PASSWORD: V3rY1ns3cur3P4ssw0rd + volumes: + - limesurvey-db:/var/lib/mysql + - limesurvey-dblog:/var/log/mysql + - limesurvey-dbetc:/etc/mysql + + limesurvey-mc: + image: memcached + + limesurvey: + image: fjudith/limesurvey:fpm + restart: always + environment: + MEMCACHE_HOST: memcached + PUBLIC_URL: http://survey.example.loc + SMTP_HOST: smtp.example.com + SMTP_TLS: 'on' + SMTP_PORT: 465 + SMTP_AUTH: 'off' + MAIL_FROM_DEFAULT: no-reply@example.com + MAIL_DOMAIN: mail.example.com + volumes: + - limesurvey-data:/var/www/html + links: + - limesurvey-md:mysql + - limesurvey-mc:memcached + + limesurvey-nginx: + image: fjudith/limesurvey:nginx + ports: + - 32706:8443/tcp + - 32705:8080/tcp + links: + - limesurvey-mc:memcached + - limesurvey:limesurvey + volumes: + - limesurvey-data:/var/www/html + - limesurvey-nginx-config:/etc/nginx + - limesurvey-nginx-log:/var/log/nginx + +volumes: + limesurvey-db: + limesurvey-dblog: + limesurvey-dbetc: + limesurvey-upload: + limesurvey-data: + limesurvey-nginx-config: + limesurvey-nginx-log: ``` And run: