Skip to content

Commit

Permalink
Only for Beyla (#1373)
Browse files Browse the repository at this point in the history
  • Loading branch information
marctc authored Nov 18, 2024
1 parent d52d50e commit 52cf07e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
4 changes: 1 addition & 3 deletions k8scache.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ COPY .git/ .git/
RUN make compile-cache

# Create final image from minimal + built binary
FROM debian:bookworm-slim
FROM scratch

LABEL maintainer="Grafana Labs <[email protected]>"

Expand All @@ -33,6 +33,4 @@ COPY --from=builder /opt/app-root/LICENSE .
COPY --from=builder /opt/app-root/NOTICE .
COPY --from=builder /opt/app-root/third_party_licenses.csv .

USER 0:0

ENTRYPOINT [ "/k8s-cache" ]
3 changes: 1 addition & 2 deletions test/integration/components/beyla-k8s-cache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ COPY Makefile Makefile
RUN make compile-cache-for-coverage

# Create final image from minimal + built binary
FROM debian:bookworm-slim
FROM scratch

WORKDIR /
COPY --from=builder /src/bin/k8s-cache .
USER 0:0

ENTRYPOINT [ "/k8s-cache" ]
3 changes: 1 addition & 2 deletions test/integration/components/beyla/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ COPY Makefile Makefile
RUN make compile-for-coverage

# Create final image from minimal + built binary
FROM debian:bookworm-slim
FROM scratch

WORKDIR /
COPY --from=builder /src/bin/beyla .
USER 0:0

ENTRYPOINT [ "/beyla" ]
3 changes: 1 addition & 2 deletions test/integration/components/beyla/Dockerfile_dbg
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ COPY Makefile Makefile
# Build
RUN make compile-for-coverage

FROM debian:bookworm-slim
FROM scratch

# Copy the native executable into the containers
COPY --from=builder /src/bin/beyla /beyla
COPY --from=builder /beyla_wrapper.sh /beyla_wrapper.sh

WORKDIR /
USER 0:0

ENTRYPOINT [ "/beyla_wrapper.sh" ]

0 comments on commit 52cf07e

Please sign in to comment.