From de6758a972954169f1ef3e5c3102afc91409774c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 2 Feb 2019 15:56:36 +0100 Subject: [PATCH] Update docker file and entrypoint. --- .deploy/docker/entrypoint.sh | 6 ++++++ Dockerfile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.deploy/docker/entrypoint.sh b/.deploy/docker/entrypoint.sh index 51919e97bc..326d932e26 100755 --- a/.deploy/docker/entrypoint.sh +++ b/.deploy/docker/entrypoint.sh @@ -25,6 +25,12 @@ then echo "Touched!" fi +if [[ $FF_DB_CONNECTION == "sqlite" ]] +then + touch $FIREFLY_PATH/storage/database/database.sqlite + echo "Touched!" +fi + # make sure we own the volumes: echo "Run chown on ${FIREFLY_PATH}/storage..." chown -R www-data:www-data -R $FIREFLY_PATH/storage diff --git a/Dockerfile b/Dockerfile index 8462fd9669..c056613149 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN chown -R www-data:www-data /var/www && \ pecl install memcached-3.1.3 && \ docker-php-ext-enable memcached && \ curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ - echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\n\n" > /etc/locale.gen && \ + echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \ locale-gen && \ composer install --prefer-dist --no-dev --no-scripts --no-suggest