Skip to content

Commit 2c175ff

Browse files
authored
Cleanup (#730)
* Cleanup - Cleans various caches after build to minimize size of intermediate images - Only copy necessary stuff over (e.g. the "patches" directory was there as well as other things like maven directory) * In preparation for 24.7 this already removes 27.0.0 It does not yet add 30.0.0
1 parent 2937e2f commit 2c175ff

2 files changed

Lines changed: 7 additions & 12 deletions

File tree

conf.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@
6262
"woodstox_core": "6.2.1",
6363
"authorizer": "0.5.0",
6464
},
65-
{
66-
"product": "27.0.0",
67-
"java-base": "11",
68-
"java-devel": "11",
69-
"jackson_dataformat_xml": "2.10.5",
70-
"stax2_api": "4.2.1",
71-
"woodstox_core": "6.2.1",
72-
"authorizer": "0.5.0",
73-
},
7465
{
7566
"product": "28.0.1",
7667
# Java 17 should be fully supported as of 27.0.0 https://github.com/apache/druid/releases#27.0.0-highlights-java-17-support

druid/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ RUN curl --fail -L "https://repo.stackable.tech/repository/packages/druid/apache
3636
mvn clean install -Pdist -pl '!extensions-core/druid-ranger-security' -DskipTests -Dmaven.javadoc.skip=true && \
3737
tar -xzf /stackable/apache-druid-${PRODUCT}-src/distribution/target/apache-druid-${PRODUCT}-bin.tar.gz && \
3838
mv /stackable/apache-druid-${PRODUCT}-src/apache-druid-${PRODUCT} /stackable/apache-druid-${PRODUCT} && \
39-
rm -rf /stackable/apache-druid-${PRODUCT}-src
39+
rm -rf /stackable/apache-druid-${PRODUCT}-src && \
40+
rm -rf /stackable/.m2 && \
41+
rm -rf /stackable/.npm && \
42+
rm -rf /stackable/.cache
43+
4044
# Do not remove the /stackable/apache-druid-${PRODUCT}/quickstart folder, it is needed for loading the Wikipedia
4145
# testdata in kuttl tests and the getting started guide.
4246

@@ -91,8 +95,8 @@ RUN microdnf update && \
9195
USER stackable
9296
WORKDIR /stackable
9397

94-
COPY --from=druid-builder /stackable /stackable
95-
COPY --chown=stackable:stackable druid/stackable /stackable
98+
COPY --from=druid-builder /stackable/apache-druid-${PRODUCT} /stackable/apache-druid-${PRODUCT}
99+
COPY --chown=stackable:stackable druid/stackable/bin /stackable/bin
96100
COPY --chown=stackable:stackable druid/licenses /licenses
97101

98102
RUN ln -s /stackable/apache-druid-${PRODUCT} /stackable/druid && \

0 commit comments

Comments
 (0)