Skip to content

Commit b65b634

Browse files
committed
fix log4j copy path; update README with new log4j setup; set quickstart to 25.3
1 parent 12bd524 commit b65b634

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ This repo contains a Dockerfile, `docker-compose.yml`, and various other files f
66

77
This repo is a work in progress. Containers created from these sources are untested. Until further work is done, integrations with LabKey products that traditionally have relied on OS configuration such as R reports or Python scripts will **NOT** work.
88

9+
## log4j2.xml
10+
March 2025 brings a new implementation of log4j2.xml. We're now using the default configuration from the [server repo](https://github.com/LabKey/server/blob/develop/server/embedded/src/main/resources/log4j2.xml), and overwriting that as needed with the local log4j2.xml file in this repo. During startup, entrypoint.sh copies the local file into the configs directory after the jar has been opened up.
11+
912
## Upgrading from 23.11 to 24.3
1013
March 2024 saw [many changes](https://github.com/LabKey/Dockerfile/commits/24.3.0) in an effort to bring this repo in line with LabKey server versioning/releases, starting with v24.3, in which the embedded tomcat version has been upgraded from 9 to 10.
1114

entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ main() {
233233

234234
if [ "$JSON_OUTPUT" = "true" ] && [ "$LOG4J_CONFIG_FILE" = "log4j2.xml" ]; then
235235
echo "JSON_OUTPUT==true && LOG4J_CONFIG_FILE==log4j2.xml, so updating application.properties and log4j2.xml to output JSON to console"
236-
cp $LOG4J_CONFIG_FILE "$LABKEY_HOME/configs/01.log4j2.xml"
236+
cp $LOG4J_CONFIG_FILE "$LABKEY_HOME/config/01.log4j2.xml"
237237
else
238238
echo "saw JSON_OUTPUT=$JSON_OUTPUT and LOG4J_CONFIG_FILE=$LOG4J_CONFIG_FILE"
239239
fi

quickstart_envs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# example minimal set of environment variables to get started - see readme for additional envs you may wish to set
44

55
# embedded tomcat LabKey .jar version to build container with
6-
export LABKEY_VERSION="24.11"
6+
export LABKEY_VERSION="25.3"
77

88
# minimal SMTP settings
99
export SMTP_HOST="localhost"

0 commit comments

Comments
 (0)