Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use develop-SNAPSHOT as default hash for develop dependencies #339

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Use develop-SNAPSHOT as default hash for develop dependencies #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ff881
Add develop-SNAPSHOT as default commit for develop deps.
raikbitters Oct 3, 2024
0edf75b
Remove def for daoCommitHash and commonsCommitHash
raikbitters Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Dockerfile
View file
Open in desktop
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=develop-SNAPSHOT
ARG COMMONS_COMMIT_HASH=develop-SNAPSHOT
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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,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
View file
Open in desktop
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
Loading