Skip to content

Replace Tomcat with Spring Boot #4963

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.

Sign up for GitHub

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

Merged
johha merged 2 commits into from
Mar 25, 2026
Merged

Replace Tomcat with Spring Boot #4963

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88a5663
Replace Tomcat with Spring Boot
johha Mar 24, 2026
369ab50
claude it up
johha Mar 25, 2026
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
25 changes: 13 additions & 12 deletions .devcontainer/images/uaa/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,29 @@ USER root

# Adapt issuer URI
# Copy to uaa URL
RUN yq e '.issuer.uri = "http://localhost:8080"' -i /uaa.yml \
# Add password.write authority to admin client (needed for password management tests)
RUN yq e '.oauth.clients.admin.authorities += ",password.write"' -i /uaa.yml \
&& yq e '.issuer.uri = "http://localhost:8080"' -i /uaa.yml \
&& yq e '.uaa.url = .issuer.uri' -i /uaa.yml

# Runtime image
FROM tomcat:10-jdk21
# Runtime image - lightweight JRE instead of Tomcat
FROM sapmachine:21-jre-headless-ubuntu-jammy

# Copy config file from yq image
COPY --from=yq /uaa.yml /uaa.yml

# Remove pre-installed apps
RUN rm -rf /usr/local/tomcat/webapps/*

# Copy CF users
# Copy CF users config
RUN mkdir -p /usr/local/cf_config
COPY uaa.yml /usr/local/cf_config/uaa.yml


# Install war from build image
COPY --from=builder /uaa/uaa/build/libs/cloudfoundry-identity-uaa-*.war /usr/local/tomcat/webapps/ROOT.war
# Install JAR from build image (Spring Boot executable JAR)
COPY --from=builder /uaa/uaa/build/libs/cloudfoundry-identity-uaa-*.war /app/uaa.jar
COPY --from=builder /uaa/k8s/templates/log4j2.properties /log4j2.properties

ENV JAVA_OPTS="-DLOGIN_CONFIG_URL=file:///uaa.yml -Dlogging.config=/log4j2.properties -DCLOUDFOUNDRY_CONFIG_PATH=/usr/local/cf_config"
ENV spring_profiles=default
ENV SPRING_PROFILES_ACTIVE=default

EXPOSE 8080

EXPOSE 8080
# Run as Spring Boot application
CMD ["sh", "-c", "java $JAVA_OPTS -jar /app/uaa.jar"]
Loading