Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 тегов
Expand Down
10 changes: 6 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -37,7 +37,9 @@ services:
restart: "no"

trackstudio:
image: maximkr/trackstudio
build:
context: .
dockerfile: Dockerfile
container_name: trackstudio
depends_on:
- migrator
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/conf/struts-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@
</action-mappings>


<controller maxFileSize="999M" memFileSize="10M" tempDir="."/>
<controller maxFileSize="999M" memFileSize="10M"/>
<message-resources parameter="language"/>


Expand Down