Skip to content

Commit

Permalink
Merge pull request #3 from MEITREX/fix_build_issues
Browse files Browse the repository at this point in the history
fix build issues
  • Loading branch information
myluki2000 authored Jul 1, 2024
2 parents fb3727c + f857262 commit 27f6aba
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ COPY . /workspace/app
RUN gradle clean build -x test
RUN mkdir -p build/dependency && (cd build/dependency; jar -xf ../libs/*-SNAPSHOT.jar)

FROM eclipse-temurin:17-jdk
FROM eclipse-temurin:21-jdk
VOLUME /tmp
ARG DEPENDENCY=/workspace/app/build/dependency
COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
ENTRYPOINT ["java","-cp","app:app/lib/*","de.unistuttgart.iste.gits.quiz_service.QuizServiceApplication"]
ENTRYPOINT ["java","-cp","app:app/lib/*","de.unistuttgart.iste.meitrex.quiz_service.QuizServiceApplication"]
14 changes: 12 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,18 @@ sourceSets.main.java.srcDir "$buildDir/generated"

// Automatically generate API documentation on project build:
// Remark: Only works on Windows
tasks.register('generateApiDocs', Exec) {
commandLine 'cmd', '/c', 'generate_api_doc.bat'
tasks.register('generateApiDocs') {
doLast {
try {
exec {
commandLine 'cmd', '/c', 'generate_api_doc.bat'
}
} catch (Exception e) {
// Catch errors when running api documentation generation.
// Errors during doc generation shouldn't cause the whole build to fail
println "Failed to generate API documentation: ${e.message}"
}
}
}

tasks.named('assemble') {
Expand Down

0 comments on commit 27f6aba

Please sign in to comment.