Skip to content

Commit

Permalink
Remove def for daoCommitHash and commonsCommitHash
Browse files Browse the repository at this point in the history
  • Loading branch information
raikbitters committed Oct 4, 2024
1 parent 87ff881 commit 0edf75b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
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
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 \
-PdaoCommitHash= ${DAO_COMMIT_HASH} \
-PcommonsCommitHash= ${COMMONS_COMMIT_HASH}\
-PdaoCommitHash=${DAO_COMMIT_HASH} \
-PcommonsCommitHash=${COMMONS_COMMIT_HASH}\
-Dorg.gradle.project.version=${APP_VERSION}; fi

FROM amazoncorretto:21.0.4
Expand Down
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ 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

0 comments on commit 0edf75b

Please sign in to comment.