diff --git a/config/Dockerfile.backend b/config/Dockerfile.backend index 195286c1..49f76a8c 100644 --- a/config/Dockerfile.backend +++ b/config/Dockerfile.backend @@ -1,5 +1,5 @@ ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1 -ARG RUNTIME_IMAGE=repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240903 +ARG RUNTIME_IMAGE=repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240917 FROM $BUILDER_IMAGE AS builder diff --git a/config/Dockerfile.frontend b/config/Dockerfile.frontend index 3c84d78a..8011098a 100644 --- a/config/Dockerfile.frontend +++ b/config/Dockerfile.frontend @@ -1,5 +1,5 @@ ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1 -ARG RUNTIME_IMAGE=docker.angie.software/angie:latest +ARG RUNTIME_IMAGE=nginx:1.24-alpine-slim FROM $BUILDER_IMAGE AS builder @@ -25,5 +25,5 @@ RUN mkdir -p $HOME/.m2 \ FROM $RUNTIME_IMAGE -COPY config/angie.conf /etc/angie/angie.conf +COPY config/nginx.conf /etc/nginx/nginx.conf COPY --from=builder /app/frontend/dist /frontend diff --git a/config/nginx.conf b/config/nginx.conf new file mode 100644 index 00000000..4dd7864e --- /dev/null +++ b/config/nginx.conf @@ -0,0 +1,84 @@ +include /etc/nginx/modules-enabled.d/*.conf; + +worker_processes 10; + +error_log /var/log/nginx/error.log; + +events { + worker_connections 1024; +} + +include /etc/nginx/conf-enabled.d/*.conf; + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + sendfile on; + + gzip on; + + # text/html doesn't need to be defined there, it's compressed always + gzip_types text/plain text/css text/xml application/x-javascript application/atom+xml; + + # gzip_comp_level 9; + include /etc/nginx/sites-enabled.d/*.conf; + + log_format nginx_main + '$remote_addr - $remote_user [$time_local] $request ' + '"$status" $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for" ' + '"$request_filename" "$gzip_ratio" $upstream_response_time server: $host : $document_root $fastcgi_script_name '; + + server { + listen 80 default; + + access_log /var/log/nginx/access.log nginx_main; + error_log /var/log/nginx/error.log error; + + charset utf-8; + + client_max_body_size 32m; + + ## + # `gzip` Settings + # + # + gzip on; + gzip_disable "msie6"; + + gzip_vary on; + gzip_proxied any; + gzip_comp_level 6; + gzip_buffers 16 8k; + gzip_http_version 1.1; + gzip_min_length 256; + gzip_types + application/atom+xml + application/geo+json + application/javascript + application/x-javascript + application/json + application/ld+json + application/manifest+json + application/rdf+xml + application/rss+xml + application/xhtml+xml + application/xml + font/eot + font/otf + font/ttf + image/svg+xml + text/css + text/javascript + text/plain + text/xml; + + location / { + root /frontend; + index index.html; + expires -1; + try_files $uri $uri/ $uri/index.html; + } + } +}