diff --git a/CLAUDE.md b/CLAUDE.md index 2993b62..6a6436a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -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 diff --git a/Dockerfile b/Dockerfile index 599552b..b3317fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/" diff --git a/quickstart_envs.sh b/quickstart_envs.sh index eb97930..2ab44f2 100644 --- a/quickstart_envs.sh +++ b/quickstart_envs.sh @@ -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" diff --git a/startup/community.properties b/startup/community.properties deleted file mode 100644 index 8b11ef5..0000000 --- a/startup/community.properties +++ /dev/null @@ -1 +0,0 @@ -${LABKEY_STARTUP_DISTRIBUTION_EXTRA} diff --git a/startup/enterprise.properties b/startup/enterprise.properties deleted file mode 100644 index 8b11ef5..0000000 --- a/startup/enterprise.properties +++ /dev/null @@ -1 +0,0 @@ -${LABKEY_STARTUP_DISTRIBUTION_EXTRA} diff --git a/startup/lims_starter.properties b/startup/lims_starter.properties deleted file mode 100644 index 03c9aaa..0000000 --- a/startup/lims_starter.properties +++ /dev/null @@ -1,17 +0,0 @@ -FolderTypes.disabledTypes;bootstrap=Dataspace - -LookAndFeelSettings.customStylesheet;bootstrap=sampleManagement:data/files/customStylesheet.css -LookAndFeelSettings.iconImage;bootstrap=sampleManagement:data/files/iconImage.ico -LookAndFeelSettings.logoImage;bootstrap=sampleManagement:data/files/logoImage.svg -LookAndFeelSettings.themeName;bootstrap=Sky - -SampleManager.updateSecurityEmailTemplates;bootstrap=true - -SiteSettings.homeProjectFolderType;bootstrap=Sample Manager -SiteSettings.homeProjectResetPermissions;bootstrap=true - -# LKSM Pro -ModuleLoader.exclude=biologics -ProductConfiguration.productKey=sampleManagerProfessional - -${LABKEY_STARTUP_DISTRIBUTION_EXTRA} diff --git a/startup/allpg.properties b/startup/manifest.properties similarity index 100% rename from startup/allpg.properties rename to startup/manifest.properties