Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include tools in product images #266

Merged
merged 15 commits into from
Dec 13, 2022
Merged

Include tools in product images #266

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9034ce8
Kcat builded within Product Image
Maleware Dec 1, 2022
daf8f0f
Added bcrypt to nifi image
Maleware Dec 1, 2022
25d16d3
Added nifi reporting task python script to nifi image
Maleware Dec 1, 2022
5acf614
Moved python scripts to nifi folder
Maleware Dec 1, 2022
4f165c9
Added openssl to Nifi
Maleware Dec 1, 2022
67b925f
Added openssl to Kafka
Maleware Dec 1, 2022
38ff515
Added openssl to trino and druid
Maleware Dec 1, 2022
af64b50
Added libxml2 and libxslt to Nifi
Maleware Dec 1, 2022
f5d6c6b
Solve Hadolint
Maleware Dec 2, 2022
5a935d9
Switched back to stackable, leftover from testing
Maleware Dec 2, 2022
63f3cd0
Merge remote-tracking branch 'origin/main' into remove-tools
sbernauer Dec 13, 2022
3cfd31d
Reduce NiFi image size
sbernauer Dec 13, 2022
b1836d3
Reduce Trino image size
sbernauer Dec 13, 2022
b480506
Reduce Kafka image size
sbernauer Dec 13, 2022
2e1cdfa
Reduce Druid image size
sbernauer Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion druid/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ LABEL name="Apache Druid" \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN microdnf update && \
microdnf install findutils && \
microdnf install findutils openssl && \
microdnf install tar gzip zip && \
microdnf install shadow-utils && \
microdnf clean all
Expand Down
18 changes: 16 additions & 2 deletions kafka/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
FROM docker.stackable.tech/stackable/javabase:11-stackable0.2.2@sha256:7929833412c331fc23cde0e23ca730d652c0be61a8a69c8a82b2af937a3fbd4e AS builder

RUN microdnf install -y zlib-devel openssl-devel cyrus-sasl-devel libcurl-devel && \
microdnf install -y tar which wget zlib gcc-c++ make cmake && \
microdnf clean all

WORKDIR /stackable
RUN curl -L -O https://github.com/edenhill/kcat/archive/refs/tags/1.7.0.tar.gz \
&& tar xvfz 1.7.0.tar.gz \
&& cd kcat-1.7.0 \
&& ./bootstrap.sh

FROM docker.stackable.tech/stackable/java-base:11-stackable0.2.2@sha256:7929833412c331fc23cde0e23ca730d652c0be61a8a69c8a82b2af937a3fbd4e

ARG PRODUCT
Expand All @@ -18,7 +30,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN microdnf update && \
microdnf install tar gzip zip && \
microdnf install shadow-utils && \
microdnf install shadow-utils openssl && \
microdnf clean all

COPY kafka/stackable /stackable
Expand Down Expand Up @@ -63,5 +75,7 @@ COPY shared/log4shell_scanner /bin/log4shell_scanner
RUN /bin/log4shell_scanner s /stackable/kafka_${SCALA}-${PRODUCT}
# ===

COPY --from=builder /stackable/kcat-1.7.0/kcat /stackable/kcat

WORKDIR /stackable/kafka
CMD ["bin/kafka-server-start.sh", "/stackable/kafka/config/server.properties"]
CMD ["bin/kafka-server-start.sh", "/stackable/kafka/config/server.properties"]
15 changes: 12 additions & 3 deletions nifi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.stackable.tech/stackable/java-base:11-stackable0.2.2@sha256:7929833412c331fc23cde0e23ca730d652c0be61a8a69c8a82b2af937a3fbd4e
sbernauer marked this conversation as resolved.
Show resolved Hide resolved
FROM docker.stackable.tech/stackable-experimental/java-base:11-stackable0.2.2@sha256:7929833412c331fc23cde0e23ca730d652c0be61a8a69c8a82b2af937a3fbd4e

ARG PRODUCT
ARG RELEASE="1"
Expand All @@ -15,14 +15,23 @@ LABEL name="Apache NiFi" \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN microdnf update && \
microdnf install tar gzip zip && \
microdnf install tar gzip zip openssl libxslt-devel libxml2-devel&& \
microdnf install python3-devel python3-pip python3-setuptools \
gcc && \
microdnf install shadow-utils && \
microdnf clean all


# The bcrypt tool is needed by NiFi to locally encrypt the admin password that is mounted as a secret in cleartext
COPY nifi/bin/stackable-bcrypt-1.0-SNAPSHOT-jar-with-dependencies.jar /bin/stackable-bcrypt.jar
# add all python scripts
COPY nifi/python /stackable/python

COPY nifi/stackable /stackable
COPY nifi/licenses /licenses

RUN groupadd -r stackable --gid=1000 && \
RUN pip3 install --no-cache-dir -r /stackable/python/requirements.txt && \
groupadd -r stackable --gid=1000 && \
useradd -r -g stackable --uid=1000 stackable && \
chown -R stackable:stackable /stackable

Expand Down
0 ...pt-1.0-SNAPSHOT-jar-with-dependencies.jar → ...pt-1.0-SNAPSHOT-jar-with-dependencies.jar
View file
Open in desktop
File renamed without changes.
0 tools/python/create_nifi_reporting_task.py → nifi/python/create_nifi_reporting_task.py
View file
Open in desktop
File renamed without changes.
0 tools/python/requirements.txt → nifi/python/requirements.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion trino/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ LABEL name="Trino" \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN microdnf update && \
microdnf install tar gzip zip python3 && \
microdnf install tar gzip zip python3 openssl && \
microdnf install shadow-utils && \
microdnf clean all

Expand Down