sync
This commit is contained in:
Халтобин Евгений
parent
83280d8ef6
commit
86045c5e3e
10 changed files with 89 additions and 130 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
#Dockerfile for TeamCity build "run in docker"
|
#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
|
ARG ADMIN_PASSWORD=Secr3t
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
|
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
|
FROM $BUILDER_IMAGE AS builder
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
|
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
|
FROM $BUILDER_IMAGE AS builder
|
||||||
|
|
||||||
|
|
@ -25,5 +25,5 @@ RUN mkdir -p $HOME/.m2 \
|
||||||
|
|
||||||
FROM $RUNTIME_IMAGE
|
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
|
COPY --from=builder /app/frontend/dist /frontend
|
||||||
|
|
|
||||||
84
config/nginx.conf
Normal file
84
config/nginx.conf
Normal file
|
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -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} \
|
|
||||||
"
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
contributor license agreements. See the NOTICE file distributed with
|
|
||||||
this work for additional information regarding copyright ownership.
|
|
||||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
(the "License"); you may not use this file except in compliance with
|
|
||||||
the License. You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
<!-- The contents of this file will be loaded for each web application -->
|
|
||||||
<Context>
|
|
||||||
|
|
||||||
<!-- Default set of monitored resources. If one of these changes, the -->
|
|
||||||
<!-- web application will be reloaded. -->
|
|
||||||
<WatchedResource>WEB-INF/web.xml</WatchedResource>
|
|
||||||
<WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
|
|
||||||
<WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
|
|
||||||
|
|
||||||
<!-- Uncomment this to disable session persistence across Tomcat restarts -->
|
|
||||||
<!--
|
|
||||||
<Manager pathname="" />
|
|
||||||
-->
|
|
||||||
|
|
||||||
<Resource name="java:/webbpm/AppDS" auth="Container"
|
|
||||||
type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
|
|
||||||
url="jdbc:postgresql://${db.app.host}:${db.app.port}/${db.app.name}"
|
|
||||||
username="${db.app.username}" password="${db.app.password}" maxTotal="20" maxIdle="10" maxWaitMillis="-1"/>
|
|
||||||
</Context>
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
contributor license agreements. See the NOTICE file distributed with
|
|
||||||
this work for additional information regarding copyright ownership.
|
|
||||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
(the "License"); you may not use this file except in compliance with
|
|
||||||
the License. You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
<tomcat-users xmlns="http://tomcat.apache.org/xml"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
|
|
||||||
version="1.0">
|
|
||||||
<!--
|
|
||||||
By default, no user is included in the "manager-gui" role required
|
|
||||||
to operate the "/manager/html" web application. If you wish to use this app,
|
|
||||||
you must define such a user - the username and password are arbitrary.
|
|
||||||
|
|
||||||
Built-in Tomcat manager roles:
|
|
||||||
- manager-gui - allows access to the HTML GUI and the status pages
|
|
||||||
- manager-script - allows access to the HTTP API and the status pages
|
|
||||||
- manager-jmx - allows access to the JMX proxy and the status pages
|
|
||||||
- manager-status - allows access to the status pages only
|
|
||||||
|
|
||||||
The users below are wrapped in a comment and are therefore ignored. If you
|
|
||||||
wish to configure one or more of these users for use with the manager web
|
|
||||||
application, do not forget to remove the <!.. ..> that surrounds them. You
|
|
||||||
will also need to set the passwords to something appropriate.
|
|
||||||
-->
|
|
||||||
<user username="admin" password="<must-be-changed>" roles="manager-gui"/>
|
|
||||||
</tomcat-users>
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--
|
|
||||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
contributor license agreements. See the NOTICE file distributed with
|
|
||||||
this work for additional information regarding copyright ownership.
|
|
||||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
(the "License"); you may not use this file except in compliance with
|
|
||||||
the License. You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
<Context antiResourceLocking="false" privileged="true" >
|
|
||||||
<CookieProcessor className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
|
|
||||||
sameSiteCookies="strict" />
|
|
||||||
<!--
|
|
||||||
<Valve className="org.apache.catalina.valves.RemoteAddrValve"
|
|
||||||
allow="d+\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" />
|
|
||||||
-->
|
|
||||||
<Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
|
|
||||||
</Context>
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
"filter_cleanup_check_period_minutes": 30,
|
"filter_cleanup_check_period_minutes": 30,
|
||||||
"auth_method": "form",
|
"auth_method": "form",
|
||||||
"enable.version.in.url": "%enable.version.in.url%",
|
"enable.version.in.url": "%enable.version.in.url%",
|
||||||
"backend.context": "fl/fl",
|
"backend.context": "fl",
|
||||||
"guard.confirm_exit": false,
|
"guard.confirm_exit": false,
|
||||||
"message_service_error_timeout": "",
|
"message_service_error_timeout": "",
|
||||||
"message_service_warning_timeout": "",
|
"message_service_warning_timeout": "",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue