diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9dce11c..f93f1f7 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -13,7 +13,7 @@ services: env_file: .env web: - build: ./docker/nginx + image: registry.ely.by/elyby/accounts-nginx:latest volumes_from: - app links: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 1d59c03..d311e0b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -9,7 +9,7 @@ services: env_file: .env web: - build: ./docker/nginx + image: registry.ely.by/elyby/accounts-nginx:1.0.2 volumes_from: - app links: diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile deleted file mode 100644 index 3c47e59..0000000 --- a/docker/nginx/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM nginx:1.11-alpine - -COPY nginx.conf /etc/nginx/nginx.conf -COPY account.ely.by.conf.template /etc/nginx/conf.d/account.ely.by.conf.template -COPY run.sh /run.sh - -RUN rm /etc/nginx/conf.d/default.conf \ - && chmod a+x /run.sh - -ENTRYPOINT ["/run.sh"] -CMD ["nginx", "-g", "daemon off;"] diff --git a/docker/nginx/account.ely.by.conf.template b/docker/nginx/account.ely.by.conf.template deleted file mode 100644 index d5b2fbc..0000000 --- a/docker/nginx/account.ely.by.conf.template +++ /dev/null @@ -1,78 +0,0 @@ -server { - listen 80; - - root $root_path; - charset utf-8; - index index.html; - etag on; - - # Это можно раскоментить для целей отладки - # rewrite_log on; - # error_log /var/log/nginx/error.log debug; - - set $root_path '/var/www/html'; - set $frontend_path '${root_path}/frontend/dist'; - - set $request_url $request_uri; - set $host_with_uri '${host}${request_uri}'; - - if ($host_with_uri ~ '^${AUTHSERVER_HOST}/auth') { - set $request_url '/api/authserver${request_uri}'; - rewrite ^/auth /api/authserver$uri last; - } - - if ($host_with_uri ~ '^${AUTHSERVER_HOST}/session') { - set $request_url '/api/minecraft${request_uri}'; - rewrite ^/session /api/minecraft$uri last; - } - - if ($host_with_uri ~ '^${AUTHSERVER_HOST}/api/(user|profiles)') { - set $request_url '/api/mojang${request_uri}'; - rewrite ^/api/(user|profiles) /api/mojang$uri last; - } - - location / { - alias $frontend_path; - try_files $uri /index.html =404; - } - - location /api { - try_files $uri $uri /api/web/index.php$is_args$args; - } - - location ~* \.php$ { - fastcgi_pass php:9000; - include fastcgi_params; - - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SERVER_NAME $host; - fastcgi_param REQUEST_URI $request_url; - fastcgi_param REMOTE_ADDR $http_x_real_ip; - - try_files $uri =404; - } - - # html файлы идут отдельно, для них будет применяться E-Tag кэширование - location ~* \.html$ { - root $frontend_path; - access_log off; - } - - # Раздача статики для frontend с указанием max-кэша. Сброс будет по #hash после ребилда webpackом - location ~* ^.+\.(jpg|jpeg|gif|png|svg|js|json|css|zip|rar|eot|ttf|woff|woff2|ico)$ { - root $frontend_path; - expires max; - etag off; - access_log off; - } - - # Запросы к статике для email, их нужно запустить внутрь vendor - location ^~ /images/emails/assets { - rewrite ^/images/emails/assets/(.+)$ /vendor/ely/emails-renderer/dist/assets/$1 last; - } - - location ^~ /vendor/ely/emails-renderer/dist/assets { - alias '${root_path}/vendor/ely/email-renderer/dist/assets'; - try_files $uri =404; - } -} diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf deleted file mode 100644 index 886547e..0000000 --- a/docker/nginx/nginx.conf +++ /dev/null @@ -1,25 +0,0 @@ -user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - keepalive_timeout 10; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/docker/nginx/run.sh b/docker/nginx/run.sh deleted file mode 100644 index 7365afe..0000000 --- a/docker/nginx/run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -envsubst '$AUTHSERVER_HOST' < /etc/nginx/conf.d/account.ely.by.conf.template > /etc/nginx/conf.d/default.conf - -exec "$@"