Skip to content

Commit

Permalink
Add develop-SNAPSHOT as default commit for develop deps.
Browse files Browse the repository at this point in the history
  • Loading branch information
raikbitters committed Oct 3, 2024
1 parent 882e3b8 commit 87ff881
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
FROM --platform=$BUILDPLATFORM gradle:8.10.0-jdk21-alpine AS build
ARG RELEASE_MODE
ARG APP_VERSION
ARG DAO_COMMIT_HASH
ARG COMMONS_COMMIT_HASH
WORKDIR /usr/app
COPY . /usr/app
RUN if [ "${RELEASE_MODE}" = true ]; then \
gradle build --no-build-cache --exclude-task test \
-PreleaseMode=true \
-Dorg.gradle.project.version=${APP_VERSION}; \
else gradle build --no-build-cache --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
else gradle build --no-build-cache --exclude-task test \
-PdaoCommitHash= ${DAO_COMMIT_HASH} \
-PcommonsCommitHash= ${COMMONS_COMMIT_HASH}\
-Dorg.gradle.project.version=${APP_VERSION}; fi

FROM amazoncorretto:21.0.4
LABEL version=${APP_VERSION} description="EPAM ReportPortal. Auth Service" maintainer="Andrei Varabyeu <[email protected]>, Hleb Kanonik <[email protected]>"
Expand Down
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ plugins {
id "org.owasp.dependencycheck" version "9.0.9"
}

def daoCommitHash = project.hasProperty('daoCommitHash') ? project.daoCommitHash : 'develop-SNAPSHOT'
def commonsCommitHash = project.hasProperty('commonsCommitHash') ? project.commonsCommitHash : 'develop-SNAPSHOT'

apply from: 'project-properties.gradle'
//apply from: "$scriptsUrl/build-docker.gradle"
apply from: "$scriptsUrl/build-info.gradle"
Expand Down Expand Up @@ -43,8 +46,8 @@ dependencies {
api 'com.epam.reportportal:commons-dao'
api 'com.epam.reportportal:commons'
} else {
api 'com.github.reportportal:commons-dao:cce9625'
api 'com.github.reportportal:commons:50a1192'
api "com.github.reportportal:commons-dao:${daoCommitHash}"
api "com.github.reportportal:commons:${commonsCommitHash}"
}

//Fix CVE-2021-41079, CVE-2022-23181, CVE-2021-33037, CVE-2021-30640, CVE-2022-42252, CVE-2023-46589, CVE-2024-24549
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ dockerJavaOptsDev=-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -XX:
dockerServerUrl=unix:///var/run/docker.sock
lombokVersion=1.18.30
daoCommitHash=develop-SNAPSHOT
commonsCommitHash=develop-SNAPSHOT

0 comments on commit 87ff881

Please sign in to comment.