Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve upgrade workflow for embedded Tomcat #200

Merged
merged 18 commits into from
Mar 11, 2024
Merged

Conversation

labkey-tchad
Copy link
Member

Rationale

LabKey/server#725

Related Pull Requests

Changes

  • Include application.properties in embedded distributions
  • Remove version from executable server jar name: labkeyServer.jar
  • Make startTomcat task work for embedded Tomcat on Windows
  • Include VERSION file in executable server jar

@labkey-tchad labkey-tchad marked this pull request as ready for review March 6, 2024 01:14

context.encryptionKey=@@encryptionKey@@

## By default, we deploy to the root context path. However, some servers have historically used /labkey or even /cpas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is to be included with a distribution, I think this comment should be updated to instruct users on intended usage, not historical context.

@@ -459,8 +463,7 @@ class ModuleDistribution extends DefaultTask
}

tarfileset(dir: BuildUtils.getBuildDirFile(project, "embedded"), prefix: archiveName) {
// include(name: "manual-upgrade.sh")
include(name: "README.txt")
exclude(name: "manual-upgrade.sh")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file still present in the embedded directory?

@labkey-tchad labkey-tchad merged commit fd28139 into develop Mar 11, 2024
1 check passed
@labkey-tchad labkey-tchad deleted the fb_embeddedUpgrade branch March 11, 2024 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[LabKey CI] Improve upgrade workflow for embedded Tomcat
2 participants