Skip to content

Commit 364821a

Browse files
committed
Removed distTar step
1 parent 54925a5 commit 364821a

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,20 @@ RUN ./gradlew --version
2323

2424
COPY ./build.gradle ./gradle.properties ./settings.gradle /code/
2525

26-
RUN ./gradlew downloadDependencies
26+
RUN ./gradlew downloadDependencies copyDependencies startScripts
2727

2828
COPY ./src /code/src
29-
COPY LICENSE README.md /code/
3029

31-
RUN ./gradlew distTar && \
32-
tar xzf build/distributions/*.tar.gz && \
33-
rm build/distributions/*.tar.gz
30+
RUN ./gradlew jar
3431

3532
FROM openjdk:8-jre-alpine
3633

3734
MAINTAINER Joris Borgdorff <[email protected]>
3835

3936
LABEL description="RADAR-base HDFS data restructuring"
4037

41-
COPY --from=builder /code/radar-hdfs-restructure-*/bin /usr/bin
42-
COPY --from=builder /code/radar-hdfs-restructure-*/share /usr/share
43-
COPY --from=builder /code/radar-hdfs-restructure-*/lib /usr/lib
38+
COPY --from=builder /code/build/third-party/* /usr/lib/
39+
COPY --from=builder /code/build/scripts/* /usr/bin/
40+
COPY --from=builder /code/build/libs/* /usr/lib/
4441

4542
ENTRYPOINT ["radar-hdfs-restructure"]

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ task downloadDependencies {
6161
configurations.runtimeClasspath.files
6262
}
6363

64+
task copyDependencies(type: Copy) {
65+
from configurations.runtimeClasspath.files
66+
into "${buildDir}/third-party/"
67+
}
68+
6469
wrapper {
6570
gradleVersion '4.8'
6671
}

0 commit comments

Comments
 (0)