diff --git a/config/Dockerfile.TC b/config/Dockerfile.TC index 3bda42c..53a93bc 100644 --- a/config/Dockerfile.TC +++ b/config/Dockerfile.TC @@ -1,6 +1,6 @@ #Dockerfile for TeamCity build "run in docker" -FROM repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240903 +FROM repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240917 ARG ADMIN_PASSWORD=Secr3t USER root diff --git a/config/Dockerfile.backend b/config/Dockerfile.backend index 491e6c0..c823625 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 3c84d78..8011098 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 0000000..4dd7864 --- /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; + } + } +} diff --git a/config/tomcat/tomee/bin/setenv.sh b/config/tomcat/tomee/bin/setenv.sh deleted file mode 100644 index 8b69e67..0000000 --- a/config/tomcat/tomee/bin/setenv.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -export JAVA_OPTS="$JAVA_OPTS \ - -Ddb.app.host=${DB_APP_HOST:-db} \ - -Ddb.app.port=${DB_APP_PORT:-5432} \ - -Ddb.app.name=${DB_APP_NAME:-app} \ - -Ddb.app.username=${DB_APP_USERNAME:-app_user} \ - -Ddb.app.password=${DB_APP_PASSWORD:-apppassword} \ -" diff --git a/config/tomcat/tomee/conf/context.xml b/config/tomcat/tomee/conf/context.xml deleted file mode 100644 index 92d999c..0000000 --- a/config/tomcat/tomee/conf/context.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - WEB-INF/web.xml - WEB-INF/tomcat-web.xml - ${catalina.base}/conf/web.xml - - - - - - diff --git a/config/tomcat/tomee/conf/tomcat-users.xml b/config/tomcat/tomee/conf/tomcat-users.xml deleted file mode 100644 index 4a9631c..0000000 --- a/config/tomcat/tomee/conf/tomcat-users.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - diff --git a/config/tomcat/tomee/conf/webbpm.properties b/config/tomcat/tomee/conf/webbpm.properties deleted file mode 100644 index 0fe1d60..0000000 --- a/config/tomcat/tomee/conf/webbpm.properties +++ /dev/null @@ -1,15 +0,0 @@ -# WebBPM properties - -authentication.method=form - -bpmn.enable=false -fias.enable=false -gar.enable=false - -reset_password.mail.template.path=mail/reset_password.html -security.password.regex=^(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]+$ - -webbpm.mode=production -webbpm.jbpm.hibernate_statistics.enabled=false -webbpm.cache.hazelcast.hosts=127.0.0.1 -webbpm.cache.hazelcast.outbound_port_definitions=5801-5820 diff --git a/config/tomcat/tomee/webapps/manager/META-INF/context.xml b/config/tomcat/tomee/webapps/manager/META-INF/context.xml deleted file mode 100644 index 82a93f3..0000000 --- a/config/tomcat/tomee/webapps/manager/META-INF/context.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/frontend/src/resources/app-config.json b/frontend/src/resources/app-config.json index f8c7648..fce2327 100644 --- a/frontend/src/resources/app-config.json +++ b/frontend/src/resources/app-config.json @@ -5,7 +5,7 @@ "filter_cleanup_check_period_minutes": 30, "auth_method": "form", "enable.version.in.url": "%enable.version.in.url%", - "backend.context": "fl/fl", + "backend.context": "fl", "guard.confirm_exit": false, "message_service_error_timeout": "", "message_service_warning_timeout": "",