diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 744523d..3374fca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: env: GH_USER_NAME: github.actor SCRIPTS_VERSION: 5.7.0 - BOM_VERSION: 5.7.4 + BOM_VERSION: 5.7.5 REPOSITORY_URL: 'https://maven.pkg.github.com/' jobs: diff --git a/Dockerfile b/Dockerfile index ea4124f..98d7f1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ -FROM alpine:latest -LABEL version=5.7.4 description="EPAM Report portal. Service jobs" maintainer="Andrei Varabyeu , Hleb Kanonik " +FROM amazoncorretto:11.0.17 +LABEL version=5.8.0 description="EPAM Report portal. Service jobs" maintainer="Andrei Varabyeu , Hleb Kanonik " ARG GH_TOKEN -RUN apk -U -q upgrade && apk --no-cache -q add openjdk11 ca-certificates && \ - echo 'exec java ${JAVA_OPTS} -jar service-jobs-5.7.4-exec.jar' > /start.sh && chmod +x /start.sh && \ - wget --header="Authorization: Bearer ${GH_TOKEN}" -q https://maven.pkg.github.com/reportportal/service-jobs/com/epam/reportportal/service-jobs/5.7.4/service-jobs-5.7.4-exec.jar +ARG GH_URL=https://__:$GH_TOKEN@maven.pkg.github.com/reportportal/service-jobs/com/epam/reportportal/service-jobs/5.8.0/service-jobs-5.8.0-exec.jar +RUN curl -O -L $GH_URL \ + --output service-jobs-5.8.0-exec.jar && \ + echo 'exec java ${JAVA_OPTS} -jar service-jobs-5.8.0-exec.jar' > /start.sh && chmod +x /start.sh ENV JAVA_OPTS="-Xmx512m -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom" VOLUME ["/tmp"] EXPOSE 8080 diff --git a/build.gradle b/build.gradle index 8ef9b9f..a104ef8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.5.14' + id 'org.springframework.boot' version '2.7.0' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } @@ -74,11 +74,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-amqp' implementation 'org.apache.jclouds.api:s3:2.5.0' implementation 'org.apache.jclouds.provider:aws-s3:2.5.0' + //Needed for correct jcloud work + implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.apache.httpcomponents:httpclient:4.5.13' // https://avd.aquasec.com/nvd/cve-2020-8908 // implementation 'com.google.guava:guava:30.0-jre'; compile "com.rabbitmq:http-client:2.1.0.RELEASE" + //Fix CVE + implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2' runtimeOnly 'org.postgresql:postgresql' diff --git a/gradle.properties b/gradle.properties index 8a54ff2..81f77b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=5.7.5 +version=5.8.0 description=EPAM Report portal. Service jobs dockerServerUrl=unix:///var/run/docker.sock dockerPrepareEnvironment=apk -U -q upgrade && apk --no-cache -q add openjdk11 ca-certificates diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 526fa52..c84bd87 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -7,4 +7,5 @@ info.build.repo=${repo} server.port=8686 management.endpoints.web.exposure.include=info, health management.endpoints.web.base-path=/ -management.endpoint.info.enabled=true \ No newline at end of file +management.endpoint.info.enabled=true +management.info.env.enabled=true \ No newline at end of file