diff --git a/.docker/php/init.sh b/.docker/php/init.sh index 6dd6aa8..09479ab 100755 --- a/.docker/php/init.sh +++ b/.docker/php/init.sh @@ -1,7 +1,7 @@ #!/bin/sh -su www-data -s /bin/bash -c "composer install" -su www-data -s /bin/bash -c "./bin/console --env=prod doctrine:migrations:migrate -n" -su www-data -s /bin/bash -c "./bin/console --env=prod cache:clear" +/bin/bash -c "composer install" +/bin/bash -c "./bin/console --env=prod doctrine:migrations:migrate -n" +/bin/bash -c "./bin/console --env=prod cache:clear" php-fpm diff --git a/Dockerfile b/Dockerfile index 73094b3..646c8b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,36 +30,12 @@ RUN chmod +x /install_composer.sh \ && /install_composer.sh \ && rm /install_composer.sh \ && mv /composer.phar /usr/local/bin/composer -# -##RUN wget https://get.symfony.com/cli/installer -O - | bash \ -## && mv /root/.symfony5/bin/symfony /usr/local/bin/symfony -# -#RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini" -# -#RUN git config --global user.email "re@spawntree.de" -# -#RUN echo 'upload_max_filesize = 16M' >> /usr/local/etc/php/conf.d/docker-php-uploadmaxfilesize.ini; -#RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/docker-php-memorylimit.ini; -# -#WORKDIR /var/www/html -# -#COPY composer.json composer.lock ./ -#RUN composer install --prefer-dist --no-interaction --no-dev --no-scripts --no-autoloader -# -#COPY . ./ -# -##RUN chown -R www-data:www-data /var/www/html && \ -## composer dump-autoload --no-dev --classmap-authoritative && \ -## composer run-script post-install-cmd --no-interaction && \ -## bin/console cache:warmup --no-debug - - -#COPY .docker/php/init.sh /init.sh +COPY .docker/php/init.sh /init.sh RUN chown -R www-data:www-data /var/www/html USER www-data EXPOSE 9000 #CMD "/.docker/php/init.sh" -#ENTRYPOINT ["/init.sh"] +ENTRYPOINT ["/init.sh"] CMD ["php-fpm"] diff --git a/docker-compose.yml b/docker-compose.yml index 5afa153..80590ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: depends_on: - php volumes: - - ./.docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro + - ./.docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro - ./../:/var/www/html:cached ports: - "8080:80" @@ -16,7 +16,7 @@ services: dockerfile: ./Dockerfile depends_on: - database - #- mailhog + - mailhog volumes: - ./:/var/www/html environment: @@ -43,8 +43,8 @@ services: - PMA_ARBITRARY=1 networks: - default -# mailhog: -# image: mailhog/mailhog:latest -# ports: -# - "127.0.0.1:8025:8025" -# - "127.0.0.1:2525:1025" + mailhog: + image: mailhog/mailhog:latest + ports: + - "127.0.0.1:8025:8025" + - "127.0.0.1:2525:1025"