Commit 871b4ea8 authored by Khalid Ali's avatar Khalid Ali
Browse files

Fix merge conflicts

parents aa621267 ca0c50ef
Pipeline #3703 passed with stages
in 7 minutes and 44 seconds
FROM gradle:jdk11 as builder
COPY --chown=gradle:gradle . /home/gradle/src
WORKDIR /home/gradle/src
RUN gradle build
FROM openjdk:11-jre-slim
COPY --from=builder /home/gradle/src/build/libs/cas.war /tmp/cas-overlay/
COPY ./tomcat.keystore /etc/cas/tomcat.keystore
COPY ./src/main/resources/etc/cas /etc/cas
WORKDIR /tmp/cas-overlay
CMD ["java", "-jar", "/tmp/cas-overlay/cas.war"]
......@@ -17,4 +17,4 @@ standalone.config=/etc/cas/config
#cas.tgc.crypto.encryption.key= LZT8P2nJeG9Wg59B2qOAM6EDZaM_BFIFtfkEX_LGdf8
#cas.webflow.crypto.signing.key= tNU9GP8Y-GmQJXtEA91aRnTZ7-lUcVSDZsYzOaotv5lHPKlQ2YrvhgDUM4y5AVY4AKmHrA3fUoefmZoQKXa1Vw
#cas.webflow.crypto.encryption.key= zRO9dXSrfHlytKiiF56lqQ==
\ No newline at end of file
#cas.webflow.crypto.encryption.key= zRO9dXSrfHlytKiiF56lqQ==
File added
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment