From 0c53eadf348f7b3636ed2f0ae35741d199c14f69 Mon Sep 17 00:00:00 2001 From: Marius van Zundert Date: Fri, 17 Mar 2017 16:55:53 +0100 Subject: [PATCH 1/3] docker-71 file now also works with new env-example setup --- php-fpm/Dockerfile-71 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 065a32fb..96804fd3 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -130,13 +130,19 @@ RUN if [ ${INSTALL_OPCACHE} = true ]; then \ COPY ./opcache.ini /usr/local/etc/php/conf.d/opcache.ini ##################################### -# Codeigniter Modifications: +# Mysqli Modifications: +##################################### +ARG INSTALL_MYSQLI=false +RUN if [ ${INSTALL_MYSQLI} = true ]; then \ + docker-php-ext-install mysqli \ +;fi + +##################################### +# Tokenizer Modifications: ##################################### -ARG CODEIGNITER=false -RUN if [ ${CODEIGNITER} = true ]; then \ - # Install Codeigniter PHP extentions requirements - docker-php-ext-install mysqli && \ +ARG INSTALL_TOKENIZER=false +RUN if [ ${INSTALL_TOKENIZER} = true ]; then \ docker-php-ext-install tokenizer \ ;fi From 4b2ddfad2001e2cd1abc4246a9c11e7a6a05a929 Mon Sep 17 00:00:00 2001 From: Marius van Zundert Date: Fri, 17 Mar 2017 19:32:45 +0100 Subject: [PATCH 2/3] Updated project example confs to not have gitignore issues --- nginx/sites/{project-1.conf => project-1.conf-example} | 0 nginx/sites/{project-2.conf => project-2-conf-example} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename nginx/sites/{project-1.conf => project-1.conf-example} (100%) rename nginx/sites/{project-2.conf => project-2-conf-example} (100%) diff --git a/nginx/sites/project-1.conf b/nginx/sites/project-1.conf-example similarity index 100% rename from nginx/sites/project-1.conf rename to nginx/sites/project-1.conf-example diff --git a/nginx/sites/project-2.conf b/nginx/sites/project-2-conf-example similarity index 100% rename from nginx/sites/project-2.conf rename to nginx/sites/project-2-conf-example From 4588685e9707cfa512821946a40d4a9b2954e4ab Mon Sep 17 00:00:00 2001 From: Marius van Zundert Date: Fri, 17 Mar 2017 19:34:32 +0100 Subject: [PATCH 3/3] Updated project example confs to fit nameing convention used in apache example --- nginx/sites/{project-1.conf-example => project-1.conf.example} | 0 nginx/sites/{project-2-conf-example => project-2.conf.example} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename nginx/sites/{project-1.conf-example => project-1.conf.example} (100%) rename nginx/sites/{project-2-conf-example => project-2.conf.example} (100%) diff --git a/nginx/sites/project-1.conf-example b/nginx/sites/project-1.conf.example similarity index 100% rename from nginx/sites/project-1.conf-example rename to nginx/sites/project-1.conf.example diff --git a/nginx/sites/project-2-conf-example b/nginx/sites/project-2.conf.example similarity index 100% rename from nginx/sites/project-2-conf-example rename to nginx/sites/project-2.conf.example