Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 17 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,25 @@ COPY . /src
RUN /src/scripts/environment/install-protoc.sh
RUN make build

FROM registry.access.redhat.com/ubi9/ubi-minimal

RUN microdnf install -y systemd tar crypto-policies-scripts && \
microdnf clean all

FROM registry.access.redhat.com/ubi9/ubi:latest AS packages

# Install ubi-micro runtime packages into a staging root directory using DNF
RUN mkdir -p /mnt/rootfs && \
dnf install -y --installroot=/mnt/rootfs \
--releasever=9 \
--setopt=install_weak_deps=false \
--nodocs \
systemd \
tar \
crypto-policies-scripts && \
dnf --installroot=/mnt/rootfs clean all

FROM registry.access.redhat.com/ubi9/ubi-micro

COPY --from=packages /mnt/rootfs/ /
# Copy PQ crypto-policies configuration from builder
COPY --from=builder /etc/crypto-policies/ /etc/crypto-policies/
COPY --from=builder /src/target/release/vector /usr/bin/

COPY --from=builder /src/target/release/vector /usr/bin
WORKDIR /usr/bin
CMD ["/usr/bin/vector"]
17 changes: 14 additions & 3 deletions Dockerfile.art
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,22 @@ RUN strip --strip-all /opt/app-root/src/target/release/vector

RUN cp /opt/app-root/src/target/release/vector /usr/bin

FROM registry.access.redhat.com/ubi9/ubi-minimal
FROM registry.access.redhat.com/ubi9/ubi:latest AS packages

COPY --from=builder /usr/bin/vector /usr/bin/
RUN microdnf install -y systemd crypto-policies-scripts
# Install ubi-micro runtime packages into a staging root directory using DNF
RUN mkdir -p /mnt/rootfs && \
dnf install -y --installroot=/mnt/rootfs \
--releasever=9 \
--setopt=install_weak_deps=false \
--nodocs \
systemd \
crypto-policies-scripts && \
dnf --installroot=/mnt/rootfs clean all

FROM registry.access.redhat.com/ubi9/ubi-micro

COPY --from=packages /mnt/rootfs/ /
COPY --from=builder /usr/bin/vector /usr/bin/
# Copy PQ crypto-policies configuration from builder
COPY --from=builder /etc/crypto-policies/ /etc/crypto-policies/

Expand Down