Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
#	src/main/java/com/epam/reportportal/auth/endpoint/AuthConfigurationEndpoint.java
#	src/main/java/com/epam/reportportal/auth/endpoint/OAuthConfigurationEndpoint.java
#	src/main/java/com/epam/reportportal/auth/integration/AuthIntegrationType.java
#	src/main/java/com/epam/reportportal/auth/integration/converter/SamlConverter.java
#	src/main/java/com/epam/reportportal/auth/integration/handler/impl/GetSamlIntegrationsStrategy.java
#	src/main/java/com/epam/reportportal/auth/integration/parameter/ParameterUtils.java
#	src/main/java/com/epam/reportportal/auth/integration/parameter/SamlParameter.java
  • Loading branch information
raikbitters committed Jun 7, 2024
2 parents 751211e + 90fde59 commit 3ddf4b6
Show file tree
Hide file tree
Showing 7 changed files with 730 additions and 105 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG APP_VERSION
WORKDIR /usr/app
COPY . /usr/app
RUN if [ "${RELEASE_MODE}" = true ]; then \
gradle build --exclude-task test \
gradle build --no-build-cache --exclude-task test \
-PreleaseMode=true \
-Dorg.gradle.project.version=${APP_VERSION}; \
else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
else gradle build --no-build-cache --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi

# For ARM build use flag: `--platform linux/arm64`
FROM --platform=$BUILDPLATFORM amazoncorretto:21.0.1
Expand Down
Loading

0 comments on commit 3ddf4b6

Please sign in to comment.