diff --git a/Dockerfile b/Dockerfile
index b1c6273..e1fb488 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,8 +82,7 @@ ENV JAVA_HOME=/usr/local/java/jdk-21.0.7
ENV PATH="$JAVA_HOME/bin:${PATH}"
# --- Install Tomcat 9.0.108 ---
-ENV TOMCAT_VERSION=9.0.108
-RUN wget https://dlcdn.apache.org/tomcat/tomcat-9/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz -O /tmp/tomcat.tar.gz \
+RUN wget https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.109/bin/apache-tomcat-9.0.109.tar.gz -O /tmp/tomcat.tar.gz \
&& mkdir -p /usr/local/tomcat \
&& tar -xzf /tmp/tomcat.tar.gz -C /usr/local/tomcat --strip-components=1 \
&& rm /tmp/tomcat.tar.gz \
diff --git a/build.gradle.kts b/build.gradle.kts
index d01b17a..e1e1f8b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
plugins {
`java`
war
- id("com.palantir.git-version") version "3.1.0"
+ id("com.palantir.git-version") version "4.0.0"
}
// Автоматическое версионирование на основе git тегов
diff --git a/docker-compose.yml b/docker-compose.yml
index f8dc465..1d65db6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,14 +18,14 @@ services:
retries: 20
migrator:
- image: liquibase/liquibase:4.30
+ build:
+ context: .
+ dockerfile: Dockerfile.migrator
container_name: trackstudio-migrator
depends_on:
db:
condition: service_healthy
working_dir: /workspace
- volumes:
- - ./liquibase:/workspace:ro
command:
[
"--changelog-file=changelog-master-${DB_LANGUAGE:-en}.xml",
@@ -37,7 +37,9 @@ services:
restart: "no"
trackstudio:
- image: maximkr/trackstudio
+ build:
+ context: .
+ dockerfile: Dockerfile
container_name: trackstudio
depends_on:
- migrator
diff --git a/src/main/webapp/WEB-INF/conf/struts-config.xml b/src/main/webapp/WEB-INF/conf/struts-config.xml
index 5c16362..ad2a6b7 100755
--- a/src/main/webapp/WEB-INF/conf/struts-config.xml
+++ b/src/main/webapp/WEB-INF/conf/struts-config.xml
@@ -1417,7 +1417,7 @@
-
+