Skip to content

Improve Docker configuration: standardize JDK, add JAVA_VERSION arg, update Tomcat#14

Open
dillonvargo wants to merge 1 commit into
masterfrom
devin/1771435712-improve-docker-config
Open

Improve Docker configuration: standardize JDK, add JAVA_VERSION arg, update Tomcat#14
dillonvargo wants to merge 1 commit into
masterfrom
devin/1771435712-improve-docker-config

Conversation

@dillonvargo

Copy link
Copy Markdown
Owner

Description of what I changed

Three improvements to the Docker and CI configuration:

  1. Made Java version configurable via a single JAVA_VERSION build arg in the Dockerfile. DEV_JDK and RUNTIME_JDK are now derived from it, so switching Java versions (e.g., --build-arg JAVA_VERSION=17) requires changing only one value instead of two.

  2. Standardized JDK distribution references across Dockerfile and bamboo-specs/bamboo.yml. The Dockerfile already used Eclipse Temurin; the CI pipeline (bamboo.yml) used amazoncorretto-21 for image tagging in the Deploy and Release jobs. Both now consistently use eclipse-temurin-21.

  3. Updated Tomcat from 11.0.11 → 11.0.18 (latest stable release) with updated SHA512 checksum.

Items for reviewer attention

  • Docker ARG interpolation before FROM: JAVA_VERSION is defined in global scope and used to derive DEV_JDK/RUNTIME_JDK which feed into FROM instructions. This should work per Docker spec, but is worth verifying with a build.
  • Image tag change in bamboo.yml: The JDK_IMAGE variable is used as a suffix for published Docker image tags (e.g., openmrs/openmrs-core:nightly-eclipse-temurin-21). Previously these tags used -amazoncorretto-21. Downstream consumers pulling by the old tag suffix will need to update.
  • Tomcat SHA512 checksum was sourced from downloads.apache.org; please independently verify.

Issue I worked on

No JIRA issue — configuration improvement for maintainability.

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.
  • I have added tests to cover my changes. (If you refactored existing code that was well tested you do not have to add tests)
  • I ran mvn clean package right before creating this pull request and added all formatting changes to my commit.
  • All new and existing tests passed.
  • My pull request is based on the latest changes of the master branch.

Link to Devin run: https://app.devin.ai/sessions/4a84210e3aad4dbd8329f36959782d2c
Requested by: @dillonvargo

…update Tomcat

- Standardize JDK references: update bamboo.yml to use eclipse-temurin-21 instead of amazoncorretto-21
- Add JAVA_VERSION build arg to Dockerfile for easier Java version switching (17, 21, 24)
- Update Tomcat from 11.0.11 to 11.0.18 with updated SHA512 checksum

Co-Authored-By: Dillon Vargo <dillonvargo@gmail.com>
@devin-ai-integration

Copy link
Copy Markdown

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment and CI monitoring

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.

1 participant