Skip to content
Open
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
2 changes: 1 addition & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ make all # login → build → tag → push (default)

### Multi-Distribution

The `startup/` directory contains per-distribution `.properties` files (`community.properties`, `enterprise.properties`, etc.). The `LABKEY_DISTRIBUTION` env var selects which file is copied in at build time and passed to the JVM.
The `startup/` directory contains `basic.properties` and `manifest.properties` — per-distribution `.properties` files were removed since prod deployments always overwrite them anyway. `startup/manifest.properties` (copied to `startup/48_manifest.properties`) carries the distribution's `ModuleLoader.include`/`ModuleLoader.exclude` set instead, generated per-build from the SNAPSHOT Installers artifact. `LABKEY_DISTRIBUTION` still selects the docker-compose service and image tag, and is passed to the JVM as an env var.

### Configuration Surface

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ COPY "labkeyServer.jar" "${LABKEY_HOME}"
# add spring properties
COPY application.properties config/

# add basic + distribution startup properties
# add basic + manifest startup properties
COPY startup/basic.properties \
startup/50_basic.properties

COPY "startup/${LABKEY_DISTRIBUTION}.properties" \
startup/49_distribution.properties
COPY startup/manifest.properties \
startup/48_manifest.properties

# add logging config files
COPY "*.log4j2.xml" "config/"
Expand Down
2 changes: 1 addition & 1 deletion quickstart_envs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# example minimal set of environment variables to get started - see readme for additional envs you may wish to set

# embedded tomcat LabKey .jar version to build container with
export LABKEY_VERSION="26.6"
export LABKEY_VERSION="26.9-SNAPSHOT"

# minimal SMTP settings
export SMTP_HOST="localhost"
Expand Down
1 change: 0 additions & 1 deletion startup/community.properties

This file was deleted.

1 change: 0 additions & 1 deletion startup/enterprise.properties

This file was deleted.

17 changes: 0 additions & 17 deletions startup/lims_starter.properties

This file was deleted.

File renamed without changes.
Loading