From 78258f7763b8ce4f9d232ade77a98330e54ca3f8 Mon Sep 17 00:00:00 2001 From: Shish Date: Wed, 7 Nov 2018 13:15:54 +0000 Subject: [PATCH] reduce diff between travis and docker --- Dockerfile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index beb3c42e..35c20085 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,21 +5,16 @@ RUN apt update && apt install -y curl HEALTHCHECK --interval=5m --timeout=3s CMD curl --fail http://127.0.0.1:8000/ || exit 1 RUN apt install -y php7.3-cli php7.3-gd php7.3-pgsql php7.3-mysql php7.3-sqlite3 php7.3-zip php7.3-dom php7.3-mbstring php-xdebug -RUN apt install -y composer imagemagick vim +RUN apt install -y composer imagemagick vim zip unzip COPY composer.json /app/ WORKDIR /app -RUN mkdir -p data/config RUN composer install COPY . /app/ -# RUN psql -c "SELECT set_config('log_statement', 'all', false);" -U postgres ; -# RUN psql -c "CREATE DATABASE shimmie;" -U postgres ; -# RUN echo ' data/config/auto_install.conf.php ; -# RUN mysql -e "SET GLOBAL general_log = 'ON';" -uroot ; -# RUN mysql -e "CREATE DATABASE shimmie;" -uroot ; -# RUN echo ' data/config/auto_install.conf.php ; -RUN echo ' data/config/auto_install.conf.php -RUN php index.php -# RUN ./vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text +RUN mkdir -p data/config && \ + echo " data/config/auto_install.conf.php && \ + php index.php && \ + ./vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text && \ + rm -rf data CMD ["/usr/bin/php", "-d", "upload_max_filesize=50M", "-d", "post_max_size=50M", "-S", "0.0.0.0:8000", "tests/router.php"]