diff --git a/Dockerfile b/Dockerfile index f02e0c4..7b7ed83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,15 @@ ENV JAVA_OPTS="-Djdk.lang.Process.launchMechanism=vfork" COPY . /workspace/app RUN apt-get -y update && apt-get -y install git RUN ./gradlew clean build -x test -RUN mkdir -p build/dependency && cd build/dependency && jar -xf ../libs/*[^p][^l][^a][^i][^n].jar + +# Copy the non-plain jar into /build/dependency +RUN mkdir -p build/dependency && cd build/dependency && jar -xf $(ls ../libs/*.jar | grep -v "plain.jar") FROM eclipse-temurin:17-jre 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/lib /app/lib COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app EXPOSE 8080 ENTRYPOINT ["java","-cp","app:app/lib/*","com.aerospike.restclient.AerospikeRestGatewayApplication"] diff --git a/build.gradle b/build.gradle index e8d6188..838ea1e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - springBootVersion = "3.2.4" + springBootVersion = "3.3.3" httpclientVersion = "4.5.14" aerospikeClientVersion = findProperty("aerospikeClientVersion") ?: "7.1.0" } @@ -77,9 +77,9 @@ dependencies { implementation("com.aerospike:aerospike-client:${aerospikeClientVersion}") implementation("com.aerospike:aerospike-document-api:2.0.3") implementation("org.msgpack:jackson-dataformat-msgpack:0.9.8") - implementation('org.springframework.retry:spring-retry:2.0.5') - implementation('org.springframework:spring-aspects:6.1.5') - implementation('org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.0') + implementation('org.springframework.retry:spring-retry:2.0.8') + implementation('org.springframework:spring-aspects:6.1.12') + implementation('org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.2') implementation('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0') implementation("javax.inject:javax.inject:1") implementation("com.google.guava:guava:32.1.3-jre")