Skip to content

Commit 94d1f10

Browse files
authored
Use clean when running shadowJar in Dockerfile (#2145)
* Add clean to build cmd for docker Signed-off-by: wslulciuc <willy@datakin.com> * Remove MARQUEZ_VERSION usage in docker/entrypoint.sh Signed-off-by: wslulciuc <willy@datakin.com> Signed-off-by: wslulciuc <willy@datakin.com>
1 parent efe5490 commit 94d1f10

3 files changed

Lines changed: 3 additions & 9 deletions

File tree

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
*.md
22
.*
33
Dockerfile
4-
build
4+
api/build
55
docs
66
web/node_modules

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ COPY build.gradle build.gradle
1212
COPY api ./api
1313
COPY api/build.gradle ./api/build.gradle
1414
COPY clients/java ./clients/java
15-
RUN ./gradlew --no-daemon :api:shadowJar
15+
RUN ./gradlew --no-daemon clean :api:shadowJar
1616

1717
FROM eclipse-temurin:17
1818
RUN apt-get update && apt-get install -y postgresql-client bash coreutils

docker/entrypoint.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,8 @@ if [[ -z "${MARQUEZ_CONFIG}" ]]; then
1212
echo "WARNING 'MARQUEZ_CONFIG' not set, using development configuration."
1313
fi
1414

15-
if [[ -z "${MARQUEZ_VERSION}" ]]; then
16-
MARQUEZ_VERSION='*'
17-
echo "WARNING 'MARQUEZ_VERSION' not set. Running could fail if directory contains multiple jar versions."
18-
fi
19-
20-
2115
# Adjust java options for the http server
2216
JAVA_OPTS="${JAVA_OPTS} -Duser.timezone=UTC -Dlog4j2.formatMsgNoLookups=true"
2317

2418
# Start http server with java options and configuration
25-
java ${JAVA_OPTS} -jar marquez-${MARQUEZ_VERSION}.jar server ${MARQUEZ_CONFIG}
19+
java ${JAVA_OPTS} -jar marquez-*.jar server ${MARQUEZ_CONFIG}

0 commit comments

Comments
 (0)