diff --git a/.env.dist b/.env.dist index b00381a..30de1dc 100644 --- a/.env.dist +++ b/.env.dist @@ -6,18 +6,10 @@ SF_COMMUNITY_PATH=./symfony # Project domains PROJECT_DOMAIN_1=symfony.local -PROJECT_DOMAIN_2=symfony2.local -PROJECT_DOMAIN_3=symfony3.local -PROJECT_DOMAIN_4=symfony4.local - -# Nginx document_root -DOCUMENT_ROOT=public # Symfony front controller SYMFONY_FRONT_CONTROLLER=index.php -NGINX_SSL_PATH=./user/nginx/ssl/ -NGINX_LOG_PATH=./var/log/nginx/ MONGODB_LOG_PATH=./var/log/mongodb/ MYSQL_DATA_PATH=./var/lib/mysql/ MONGODB_DATA_PATH=./var/lib/mongodb/ @@ -76,9 +68,8 @@ PMA_AUTO_LOGIN_ROOT=no # Open ports PORT_MYSQL=3306 -PORT_NGINX=80 -PORT_NGINX_SSL=443 -PORT_PHP=9000 +PORT_WEB=80 +PORT_WEB_SSL=443 PORT_MAIL_SMTP=1025 PORT_MAIL_HTTP=8025 PORT_PMA=8080 @@ -137,7 +128,6 @@ PHP_IDE_CONFIG=serverName=symfony-docker # Node JS available versions: 16, 18, 20, 20, 21 NODE_JS_VERSION=21 -CLEAN_NGINX_LOGS=no CLEAN_SF_logs=no # docker-compose.yml configuration @@ -164,7 +154,7 @@ PHP_IMAP=no EXTERNAL_NETWORK=no -RABBITMQ_VERSION=3.12.12 +RABBITMQ_VERSION=3.13 ELASTICSEARCH_VERSION=6.8.23 ELK_VERSION=7.16.0 # MongoDB available versions: 4.2.24, 4.4.26, 5.0.23, 6.0.12 diff --git a/commands/start.go b/commands/start.go index 510ab5f..7874365 100644 --- a/commands/start.go +++ b/commands/start.go @@ -23,7 +23,6 @@ var startCmd = &console.Command{ Usage: "", Action: func(c *console.Context) error { doChecks() - doBuildNginxConf() doBuildMySQLConf() doBuild() doBeforeStart() @@ -132,8 +131,6 @@ func doChecks() { os.Create(sshKeyPath + "/known_hosts") } - os.MkdirAll(os.Getenv("NGINX_SSL_PATH"), 0755) - os.Mkdir(os.Getenv("NGINX_LOG_PATH"), 0755) os.Mkdir(os.Getenv("MYSQL_DATA_PATH"), 0755) os.Mkdir(os.Getenv("USER_CONFIG_PATH"), 0755) os.Mkdir(os.Getenv("MONGODB_LOG_PATH"), 0755) @@ -149,13 +146,6 @@ func doChecks() { util.AppendFile(os.Getenv("USER_CONFIG_PATH")+"/.my.cnf", data) } - if os.Getenv("NGINX_SSL") == "yes" { - if !util.FileExists("user/nginx/ssl/d4d.pem") || !util.FileExists("user/nginx/ssl/d4d-key.pem") { - // ./d4d mkcert ssl - } - } - - doNginxBuild() doPhpBuild() doPhpMyAdminBuild() @@ -181,24 +171,6 @@ func doChecks() { util.Sed("__MYSQL_PASSWORD__", pmaMySQLPassword, "config/phpmyadmin/config.user.inc.php") } -func doNginxBuild() { - util.Copy("config/nginx/Dockerfile.build", "config/nginx/Dockerfile") - - util.Sed("__DEBIAN_VERSION__", os.Getenv("DEBIAN_VERSION"), "config/nginx/Dockerfile") - - if os.Getenv("NGINX_SSL") == "yes" { - os.Mkdir("config/nginx/ssl", 0755) - - util.Copy("user/nginx/ssl/d4d.pem", "config/nginx/ssl/d4d.pem") - util.Copy("user/nginx/ssl/d4d-key.pem", "config/nginx/ssl/d4d-key.pem") - - util.Sed("__D4D_SSL__", "COPY [\"ssl/d4d.pem\", \"ssl/d4d-key.pem\", \"/etc/nginx/ssl/\"]", "config/nginx/Dockerfile") - - } else { - util.Sed("__D4D_SSL__", "", "config/nginx/Dockerfile") - } -} - func doPhpBuild() { util.Copy("config/php/Dockerfile.build", "config/php/Dockerfile") @@ -428,39 +400,6 @@ func remove(haystack []string, needle string) []string { return haystack } -func doBuildNginxConf() { - projectConfFile := "config/nginx/project.conf" - - if os.Getenv("NGINX_SSL") == "yes" { - util.Copy("config/nginx/project-ssl.conf.default", projectConfFile) - } else { - util.Copy("config/nginx/project.conf.default", projectConfFile) - } - - util.Sed("__INCLUDE__", "/etc/nginx/d4d/sf.conf", projectConfFile) - util.Sed("__PHP_MAX_EXECUTION_TIME__", os.Getenv("PHP_MAX_EXECUTION_TIME"), projectConfFile) - util.Sed("__NGINX_FASTCGI_BUFFERS__", os.Getenv("NGINX_FASTCGI_BUFFERS"), projectConfFile) - util.Sed("__NGINX_FASTCGI_BUFFER_SIZE__", os.Getenv("NGINX_FASTCGI_BUFFER_SIZE"), projectConfFile) - util.Sed("__PHP_UPLOAD_MAX_FILESIZE__", os.Getenv("PHP_UPLOAD_MAX_FILESIZE"), projectConfFile) - - util.Copy("config/nginx/d4d/pwa.conf.default", "config/nginx/d4d/pwa.conf") - util.Sed("__SYMFONY_FRONT_CONTROLLER__", os.Getenv("SYMFONY_FRONT_CONTROLLER"), "config/nginx/d4d/pwa.conf") - - util.Copy("config/nginx/d4d/sf.conf.default", "config/nginx/d4d/sf.conf") - util.Sed("__SYMFONY_FRONT_CONTROLLER__", os.Getenv("SYMFONY_FRONT_CONTROLLER"), "config/nginx/d4d/sf.conf") - - util.Copy("config/nginx/d4d/wp.conf.default", "config/nginx/d4d/wp.conf") - util.Sed("__SYMFONY_FRONT_CONTROLLER__", os.Getenv("SYMFONY_FRONT_CONTROLLER"), "config/nginx/d4d/wp.conf") - - nginxIncludeCache := "" - - if os.Getenv("NGINX_CACHE") == "yes" { - nginxIncludeCache = "include /etc/nginx/d4d/cache.conf;" - } - - util.Sed("__INCLUDE_CACHE__", nginxIncludeCache, projectConfFile) -} - func doBuildMySQLConf() { util.Copy("config/mysql/d4d.cnf.d4d", "config/mysql/d4d.cnf") util.Sed("__MYSQL_MAX_ALLOWED_PACKET__", os.Getenv("MYSQL_MAX_ALLOWED_PACKET"), "config/mysql/d4d.cnf") @@ -527,10 +466,6 @@ func doBuild() { util.AppendFile("docker-compose.yml", util.FileGetContents("docker/elk.yml")) } - if os.Getenv("EXTERNAL_NETWORK") == "no" || os.Getenv("EXTERNAL_NETWORK") == "yes" { - util.Sed("__NGINX_NETWORKS__", fmt.Sprintf("networks:\n default:\n aliases:\n - %s", os.Getenv("PROJECT_DOMAIN_1")), "docker-compose.yml") - } - if os.Getenv("EXTERNAL_NETWORK") == "yes" { util.AppendFile("docker-compose.yml", util.FileGetContents("docker/network.yml")) } @@ -540,12 +475,6 @@ func doBeforeStart() { envFile := util.GetCurrentDir() + "/.env" util.LoadEnvFile(envFile) - if os.Getenv("CLEAN_NGINX_LOGS") == "yes" { - if err := os.Truncate("var/logs/nginx/project_access.log", 0); err != nil { - log.Printf("Failed to truncate: %v", err) - } - } - if os.Getenv("CLEAN_SF_logs") == "yes" { os.RemoveAll("project/var/cache") os.RemoveAll("project/var/log") diff --git a/config/nginx/Dockerfile.build b/config/nginx/Dockerfile.build deleted file mode 100644 index 9930a02..0000000 --- a/config/nginx/Dockerfile.build +++ /dev/null @@ -1,67 +0,0 @@ -ARG DEBIAN_VERSION - -FROM debian:${DEBIAN_VERSION} - -ARG PROJECT_DOMAIN_1 -ARG PROJECT_DOMAIN_2 -ARG PROJECT_DOMAIN_3 -ARG PROJECT_DOMAIN_4 -ARG DOCUMENT_ROOT -ARG SYMFONY_FRONT_CONTROLLER -ARG PHP_MAX_EXECUTION_TIME -ARG PHP_UPLOAD_MAX_FILESIZE - -ARG PORT_PHP - -MAINTAINER Vasilij Dusko - -RUN apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - curl gnupg2 ca-certificates lsb-release debian-archive-keyring \ - && curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \ - | tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null \ - && gpg --dry-run --quiet --no-keyring --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg \ - && echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \ - http://nginx.org/packages/debian `lsb_release -cs` nginx" \ - | tee /etc/apt/sources.list.d/nginx.list \ - && printf 'Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n' > /etc/apt/preferences.d/99nginx \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - nginx \ - gettext-base \ - nano \ - && apt-get remove --purge -y gnupg2 \ - && apt-get -y --purge autoremove \ - && apt-get clean && rm -rf /var/lib/apt/lists/* - -COPY project.conf /etc/nginx/sites-available/ -COPY rewrite/project.conf /etc/nginx/rewrite/ - -COPY ["d4d/cache.conf", "d4d/sf.conf", "/etc/nginx/d4d/"] -__D4D_SSL__ - -# optional commands to run at shell inside container at build time -# this one adds package repo for nginx from nginx.org and installs it -# forward request and error logs to docker log collector - -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - && mkdir -p /etc/nginx/sites-available \ - && mkdir -p /etc/nginx/sites-enabled \ - && mkdir -p /etc/nginx/d4d \ - && mkdir -p /etc/nginx/rewrite \ - && sed -i 's#__PROJECT_DOMAIN_1__#'"${PROJECT_DOMAIN_1}"'#g' /etc/nginx/sites-available/project.conf \ - && sed -i 's#__PROJECT_DOMAIN_2__#'"${PROJECT_DOMAIN_2}"'#g' /etc/nginx/sites-available/project.conf \ - && sed -i 's#__PROJECT_DOMAIN_3__#'"${PROJECT_DOMAIN_3}"'#g' /etc/nginx/sites-available/project.conf \ - && sed -i 's#__PROJECT_DOMAIN_4__#'"${PROJECT_DOMAIN_4}"'#g' /etc/nginx/sites-available/project.conf \ - && sed -i 's#__DOCUMENT_ROOT__#'"${DOCUMENT_ROOT}"'#g' /etc/nginx/sites-available/project.conf \ - && sed -i 's#__SYMFONY_FRONT_CONTROLLER__#'"${SYMFONY_FRONT_CONTROLLER}"'#g' /etc/nginx/sites-available/project.conf \ - && sed -i 's#__PHP_MAX_EXECUTION_TIME__#'"${PHP_MAX_EXECUTION_TIME}"'#g' /etc/nginx/sites-available/project.conf \ - && sed -i 's#__PHP_UPLOAD_MAX_FILESIZE__#'"${PHP_UPLOAD_MAX_FILESIZE}"'#g' /etc/nginx/sites-available/project.conf \ - && ln -s /etc/nginx/sites-available/project.conf /etc/nginx/sites-enabled/project.conf \ - && rm -rf /etc/nginx/sites-enabled/default \ - && echo "upstream php-upstream { server php:${PORT_PHP}; }" > /etc/nginx/conf.d/upstream.conf - -CMD ["nginx", "-g", "daemon off;"] -# required: run this command when container is launched -# only one CMD allowed, so if there are multiple, last one wins \ No newline at end of file diff --git a/config/nginx/d4d/cache.conf b/config/nginx/d4d/cache.conf deleted file mode 100644 index 78f16d4..0000000 --- a/config/nginx/d4d/cache.conf +++ /dev/null @@ -1,8 +0,0 @@ -# expire -location ~* \.(?:ico|css|js|gif|jpe?g|png|svg|woff|woff2|eot|ttf)$ { - try_files $uri /website.php/$1?$query_string; - access_log off; - expires 30d; - add_header Pragma public; - add_header Cache-Control "public"; -} \ No newline at end of file diff --git a/config/nginx/d4d/sf.conf.default b/config/nginx/d4d/sf.conf.default deleted file mode 100644 index 0e1077f..0000000 --- a/config/nginx/d4d/sf.conf.default +++ /dev/null @@ -1,8 +0,0 @@ -location / { - index __SYMFONY_FRONT_CONTROLLER__; - try_files $uri @rewriteapp; -} - -location @rewriteapp { - rewrite ^(.*)$ /__SYMFONY_FRONT_CONTROLLER__/$1 last; -} \ No newline at end of file diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf deleted file mode 100644 index 68680b1..0000000 --- a/config/nginx/nginx.conf +++ /dev/null @@ -1,44 +0,0 @@ -user www-data; -worker_processes auto; -pid /run/nginx.pid; - -events { - worker_connections 2048; - multi_accept on; - use epoll; -} - -http { - server_tokens off; - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 15; - types_hash_max_size 2048; - include /etc/nginx/mime.types; - default_type application/octet-stream; - access_log off; - error_log off; - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/json - application/xml - application/rss+xml - image/svg+xml; - - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*; - open_file_cache max=100; -} \ No newline at end of file diff --git a/config/nginx/project-ssl.conf.default b/config/nginx/project-ssl.conf.default deleted file mode 100644 index 81c1c91..0000000 --- a/config/nginx/project-ssl.conf.default +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen 80 default_server; - - server_name - __PROJECT_DOMAIN_1__ - __PROJECT_DOMAIN_2__ - __PROJECT_DOMAIN_3__ - __PROJECT_DOMAIN_4__ - ; - root /var/www/project/__DOCUMENT_ROOT__; - - location / { - return 301 https://$host$request_uri; - } -} - -server { - server_name .ngrok.io; - root /var/www/project/__DOCUMENT_ROOT__; - - include /etc/nginx/rewrite/project.conf; - - access_log /var/log/nginx/project_access.log; - error_log /var/log/nginx/project_error.log; - - # strip app.php/ prefix if it is present - rewrite ^/app\.php/?(.*)$ /$1 permanent; - - include __INCLUDE__; - - __INCLUDE_CACHE__ - - # pass the PHP script to FastCGI server from upstream phpfcgi - location ~ ^/(app|app_dev|index|config|_intellij_phpdebug_validator)\.php(/|$) { - fastcgi_pass php-upstream; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SYMFONY_ENV dev; - fastcgi_param HTTPS on; - fastcgi_read_timeout __PHP_MAX_EXECUTION_TIME__; - - fastcgi_buffers __NGINX_FASTCGI_BUFFERS__; - fastcgi_buffer_size __NGINX_FASTCGI_BUFFER_SIZE__; - } - - client_max_body_size __PHP_UPLOAD_MAX_FILESIZE__; -} - -server { - listen 443 ssl http2 default_server; - - ssl_certificate /etc/nginx/ssl/d4d.pem; - ssl_certificate_key /etc/nginx/ssl/d4d-key.pem; - - server_name - __PROJECT_DOMAIN_1__ - __PROJECT_DOMAIN_2__ - __PROJECT_DOMAIN_3__ - __PROJECT_DOMAIN_4__ - ; - root /var/www/project/__DOCUMENT_ROOT__; - - include /etc/nginx/rewrite/project.conf; - - access_log /var/log/nginx/project_access.log; - error_log /var/log/nginx/project_error.log; - - # strip app.php/ prefix if it is present - rewrite ^/app\.php/?(.*)$ /$1 permanent; - - include __INCLUDE__; - - __INCLUDE_CACHE__ - - # pass the PHP script to FastCGI server from upstream phpfcgi - location ~ ^/(app|app_dev|index|config|_intellij_phpdebug_validator)\.php(/|$) { - fastcgi_pass php-upstream; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SYMFONY_ENV dev; - fastcgi_param HTTPS on; - fastcgi_read_timeout __PHP_MAX_EXECUTION_TIME__; - - fastcgi_buffers __NGINX_FASTCGI_BUFFERS__; - fastcgi_buffer_size __NGINX_FASTCGI_BUFFER_SIZE__; - } - - client_max_body_size __PHP_UPLOAD_MAX_FILESIZE__; -} \ No newline at end of file diff --git a/config/nginx/project.conf.default b/config/nginx/project.conf.default deleted file mode 100644 index b769244..0000000 --- a/config/nginx/project.conf.default +++ /dev/null @@ -1,37 +0,0 @@ -server { - server_name - __PROJECT_DOMAIN_1__ - __PROJECT_DOMAIN_2__ - __PROJECT_DOMAIN_3__ - __PROJECT_DOMAIN_4__ - ; - root /var/www/project/__DOCUMENT_ROOT__; - - include /etc/nginx/rewrite/project.conf; - - access_log /var/log/nginx/project_access.log; - error_log /var/log/nginx/project_error.log; - - # strip app.php/ prefix if it is present - rewrite ^/app\.php/?(.*)$ /$1 permanent; - - include __INCLUDE__; - - __INCLUDE_CACHE__ - - # pass the PHP script to FastCGI server from upstream phpfcgi - location ~ ^/(app|app_dev|index|config|_intellij_phpdebug_validator)\.php(/|$) { - fastcgi_pass php-upstream; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SYMFONY_ENV dev; - fastcgi_param HTTPS off; - fastcgi_read_timeout __PHP_MAX_EXECUTION_TIME__; - - fastcgi_buffers __NGINX_FASTCGI_BUFFERS__; - fastcgi_buffer_size __NGINX_FASTCGI_BUFFER_SIZE__; - } - - client_max_body_size __PHP_UPLOAD_MAX_FILESIZE__; -} \ No newline at end of file diff --git a/config/nginx/rewrite/project.conf b/config/nginx/rewrite/project.conf deleted file mode 100644 index e69de29..0000000 diff --git a/config/php/Dockerfile.build b/config/php/Dockerfile.build index bfa928c..25de8ee 100644 --- a/config/php/Dockerfile.build +++ b/config/php/Dockerfile.build @@ -1,6 +1,6 @@ ARG PHP_VERSION -FROM php:${PHP_VERSION}-fpm +FROM php:${PHP_VERSION}-apache ARG DEFAULT_TIMEZONE ARG PHP_MEMORY_LIMIT @@ -74,6 +74,8 @@ RUN __PHP_EXT_CONFIGURE__ # Copy xdebug and php config. COPY conf.d/* /usr/local/etc/php/conf.d/ +COPY apache/000-default.conf /etc/apache2/sites-available/000-default.conf + # Map user id from host user when it's provided RUN if [ ! -z ${USER_ID} ] && [ ${USER_ID} -ne 0 ]; then usermod -u ${USER_ID} www-data; fi \ && if [ ! -z ${GROUP_ID} ] && [ ${GROUP_ID} -ne 0 ]; then groupmod -g ${GROUP_ID} www-data; fi diff --git a/config/php/apache/000-default.conf b/config/php/apache/000-default.conf new file mode 100644 index 0000000..1ada618 --- /dev/null +++ b/config/php/apache/000-default.conf @@ -0,0 +1,29 @@ + + # The ServerName directive sets the request scheme, hostname and port that + # the server uses to identify itself. This is used when creating + # redirection URLs. In the context of virtual hosts, the ServerName + # specifies what hostname must appear in the request's Host: header to + # match this virtual host. For the default virtual host (this file) this + # value is not decisive as it is used as a last resort host regardless. + # However, you must set it for any further virtual host explicitly. + #ServerName www.example.com + + ServerAdmin webmaster@localhost + DocumentRoot /var/www/project/public + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + diff --git a/d4d b/d4d index fa3cb39..44ec6eb 100755 --- a/d4d +++ b/d4d @@ -623,10 +623,10 @@ mkcert() { ./d4d mkcert ssl fi - if [ "${COMMAND}" = "ssl" ]; then - DOMAINS="${PROJECT_DOMAIN_1} ${PROJECT_DOMAIN_2} ${PROJECT_DOMAIN_3} ${PROJECT_DOMAIN_4}" - MKCERT -cert-file ${WORK_DIR}/user/nginx/ssl/d4d.pem -key-file ${WORK_DIR}/user/nginx/ssl/d4d-key.pem ${DOMAINS} - fi +# if [ "${COMMAND}" = "ssl" ]; then +# DOMAINS="${PROJECT_DOMAIN_1} ${PROJECT_DOMAIN_2} ${PROJECT_DOMAIN_3} ${PROJECT_DOMAIN_4}" +# MKCERT -cert-file ${WORK_DIR}/user/nginx/ssl/d4d.pem -key-file ${WORK_DIR}/user/nginx/ssl/d4d-key.pem ${DOMAINS} +# fi fi } diff --git a/docker/compose.yml b/docker/compose.yml index 3d7f12f..1a8c624 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -1,29 +1,3 @@ version: '3' services: - nginx: - build: - context: config/nginx - args: - PROJECT_DOMAIN_1: ${PROJECT_DOMAIN_1} - PROJECT_DOMAIN_2: ${PROJECT_DOMAIN_2} - PROJECT_DOMAIN_3: ${PROJECT_DOMAIN_3} - PROJECT_DOMAIN_4: ${PROJECT_DOMAIN_4} - DOCUMENT_ROOT: ${DOCUMENT_ROOT} - DEBIAN_VERSION: ${DEBIAN_VERSION} - SYMFONY_FRONT_CONTROLLER: ${SYMFONY_FRONT_CONTROLLER} - PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME} - PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE} - PORT_PHP: ${PORT_PHP} - ports: - - ${PORT_NGINX}:80 - - ${PORT_NGINX_SSL}:443 - __NGINX_NETWORKS__ - volumes: - - ${PROJECT_PATH}:/var/www/project:cached - - ${NGINX_LOG_PATH}:/var/log/nginx - - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - depends_on: - - php - environment: - - TZ=${DEFAULT_TIMEZONE} diff --git a/docker/ngrok.yml b/docker/ngrok.yml index 2cd5e73..1ac297b 100644 --- a/docker/ngrok.yml +++ b/docker/ngrok.yml @@ -7,5 +7,5 @@ - nginx environment: - NGROK_LOOK_DOMAIN=${PROJECT_DOMAIN_1} - - NGROK_PORT=${PORT_NGINX} + - NGROK_PORT=${PORT_WEB} - NGROK_AUTH=${NGROK_AUTH} diff --git a/docker/php.yml b/docker/php.yml index 68ccdad..12bfc50 100644 --- a/docker/php.yml +++ b/docker/php.yml @@ -18,8 +18,7 @@ XDEBUG_FILE_LINK_FORMAT: ${XDEBUG_FILE_LINK_FORMAT} XDEBUG_IDE_KEY: ${XDEBUG_IDE_KEY} ports: - - ${PORT_PHP}:9000 - - 8888:8888 + - ${PORT_WEB}:80 volumes: - ${PROJECT_PATH}:/var/www/project:cached - ${SF_COMMUNITY_PATH}:/var/www/symfony:cached