diff --git a/docker-compose.yml b/docker-compose.yml index 72d0481..bf1f1fd 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,17 +20,38 @@ services: - tomcat - mysqldb - myadmin: - image: phpmyadmin/phpmyadmin:latest - container_name: phpmyadmin + ghost: + image: ghost:2.0.3-alpine + container_name: ghost ports: - - "9000:80" - environment: - - PMA_ARBITRARY=1 - - PMA_HOST=mysql + - "127.0.0.1:2368:2368" restart: always - depends_on: - - mysqldb + env_file: + - ".env" + volumes: + - "./etc/ghost/content:/var/lib/ghost/content" + environment: + - url=${URL} + - privacy__useUpdateCheck=false + + php: + image: php:7.2.9-fpm-alpine3.6 + container_name: php + ports: + - "127.0.0.1:9001:9000" + volumes: + - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini" + - "./Website:/var/www/html" + + tomcat: + image: tomcat:latest + container_name: tomcat + ports: + - "127.0.0.1:8080:8080" + restart: always + volumes: + - "./Website:/usr/local/tomcat/webapps/ROOT" + - "./etc/tomcat:/usr/local/tomcat/conf" mysqldb: image: mariadb:latest @@ -54,35 +75,14 @@ services: - "./data/db/mysql:/var/lib/mysql" - "./etc/mariadb/innodb.cnf:/etc/mysql/conf.d/innodb.cnf:ro" - tomcat: - image: tomcat:latest - container_name: tomcat + myadmin: + image: phpmyadmin/phpmyadmin:latest + container_name: phpmyadmin ports: - - "8080:8080" - restart: always - volumes: - - "./Website:/usr/local/tomcat/webapps/ROOT" - - "./etc/tomcat:/usr/local/tomcat/conf" - - ghost: - image: ghost:2.0.3-alpine - container_name: ghost - ports: - - "127.0.0.1:2368:2368" - restart: always - env_file: - - ".env" - volumes: - - "./etc/ghost/content:/var/lib/ghost/content" + - "9000:80" environment: - - url=${URL} - - privacy__useUpdateCheck=false - - php: - image: php:7.2.9-fpm-alpine3.6 - container_name: php - ports: - - "9001:9001" - volumes: - - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini" - - "./Website:/var/www/html/public" + - PMA_ARBITRARY=1 + - PMA_HOST=mysql + restart: always + depends_on: + - mysqldb diff --git a/etc/nginx/default.conf b/etc/nginx/default.conf index 29ae090..1da4553 100755 --- a/etc/nginx/default.conf +++ b/etc/nginx/default.conf @@ -15,26 +15,14 @@ server { error_log /var/log/nginx/error.log; access_log /var/log/nginx/access.log; - root /app; - index index.php index.jsp index.html index.htm; + index index.jsp index.html index.htm; client_max_body_size 100M; - location / { - root /var/www/html; - } - ####### Proxies ####### # PHP proxy -# location ~ \.php$ { -# fastcgi_pass php:9001; -# fastcgi_index index.php; -# include php/fastcgi.conf; -# root /app; -# } - location ~ \.php$ { - try_files $uri =404; + #try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass php:9001; fastcgi_index index.php; diff --git a/etc/php/fastcgi.conf b/etc/php/fastcgi.conf deleted file mode 100755 index a9fb1ba..0000000 --- a/etc/php/fastcgi.conf +++ /dev/null @@ -1,17 +0,0 @@ -fastcgi_param GATEWAY_INTERFACE CGI/1.1; -fastcgi_param SERVER_SOFTWARE nginx; -fastcgi_param QUERY_STRING $query_string; -fastcgi_param REQUEST_METHOD $request_method; -fastcgi_param CONTENT_TYPE $content_type; -fastcgi_param CONTENT_LENGTH $content_length; -fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; -fastcgi_param SCRIPT_NAME $fastcgi_script_name; -fastcgi_param REQUEST_URI $request_uri; -fastcgi_param DOCUMENT_URI $document_uri; -fastcgi_param DOCUMENT_ROOT $document_root; -fastcgi_param SERVER_PROTOCOL $server_protocol; -fastcgi_param REMOTE_ADDR $remote_addr; -fastcgi_param REMOTE_PORT $remote_port; -fastcgi_param SERVER_ADDR $server_addr; -fastcgi_param SERVER_PORT $server_port; -fastcgi_param SERVER_NAME $server_name;