From a4a23455146a19f45ce97937e78a3b82e5246805 Mon Sep 17 00:00:00 2001 From: Yaroslav Mokhurenko Date: Fri, 22 Jan 2021 14:47:58 +0200 Subject: [PATCH] - Clone dreamfactory from master - Update to composer 2 --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f68249b..7866ce9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM dreamfactorysoftware/df-base-img:php7.2 +FROM dreamfactorysoftware/df-base-img:develop # Configure Nginx COPY dreamfactory.conf /etc/nginx/sites-available/dreamfactory.conf # Get DreamFactory -RUN git clone --branch 4.3.3 https://github.com/dreamfactorysoftware/dreamfactory.git /opt/dreamfactory +RUN git clone https://github.com/dreamfactorysoftware/dreamfactory.git /opt/dreamfactory WORKDIR /opt/dreamfactory @@ -12,8 +12,7 @@ WORKDIR /opt/dreamfactory # COPY composer.* /opt/dreamfactory/ # Install packages -RUN composer global require hirak/prestissimo && \ - composer install --no-dev --ignore-platform-reqs && \ +RUN composer install --no-dev --ignore-platform-reqs && \ php artisan df:env --db_connection=sqlite --df_install=Docker && \ chown -R www-data:www-data /opt/dreamfactory && \ rm /etc/nginx/sites-enabled/default