Skip to content

Update Dockerfile used for ART to match environment #241

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

Open
xperimental wants to merge 1 commit into
base: v0.47.0-rh
Choose a base branch
from
+5 −10
Open

Update Dockerfile used for ART to match environment #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions Dockerfile.art
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/rhel9-6-els/rhel:9.6@sha256:79408df6a94a716af2f2bd6aff681e33c7c91691ac128a0c5fb90b423dbd48ad AS builder
FROM registry.access.redhat.com/ubi9/ubi-minimal AS builder

RUN INSTALL_PKGS=" \
gcc-c++ \
Expand All @@ -7,7 +7,7 @@ RUN INSTALL_PKGS=" \
openssl-devel \
rust-toolset-1.84.1 \
" && \
dnf install -y $INSTALL_PKGS && \
microdnf install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS

COPY . /opt/app-root/src
Expand All @@ -17,32 +17,27 @@ RUN PROTOC=/opt/app-root/src/thirdparty/protoc/protoc-linux-$(arch) make build-o

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

FROM registry.redhat.io/rhel9-6-els/rhel:9.6@sha256:79408df6a94a716af2f2bd6aff681e33c7c91691ac128a0c5fb90b423dbd48ad
FROM registry.access.redhat.com/ubi9/ubi-minimal

COPY --from=builder /usr/bin/vector /usr/bin/
RUN dnf install -y systemd
RUN microdnf install -y systemd

WORKDIR /usr/bin
CMD ["/usr/bin/vector"]

ARG VECTOR_URL
ARG VECTOR_COMMIT
LABEL \
com.redhat.component="logging-vector-container" \
description="Vector container for collection of container logs" \
distribution-scope="subscription" \
io.k8s.description="Vector container for collection of container logs" \
io.k8s.display-name="Vector" \
io.openshift.build.commit.id=${VECTOR_COMMIT} \
io.openshift.build.commit.url=${VECTOR_URL}/commit/${VECTOR_COMMIT} \
io.openshift.build.source-location=${VECTOR_URL} \
io.openshift.maintainer.product="OpenShift Container Platform" \
io.openshift.tags="logging,vector,observability" \
license="Apache-2.0" \
maintainer="AOS Logging <team-logging@redhat.com>" \
name="openshift-logging/vector-rhel9" \
summary="Log collection agent for Red Hat Openshift Logging" \
url=${VECTOR_URL} \
url="https://catalog.redhat.com/en/software/containers/openshift-logging/vector-rhel9/6447991f84aeefde2c9f2bcf" \
vendor="Red Hat, Inc." \
version_minor="v0.47" \
version="v0.47.0"