Skip to content

Commit

Permalink
Change default entrypoint for both usecases
Browse files Browse the repository at this point in the history
Keep behaviour of original cilium-cli-ci image to have empty entrypoint
Add behaviour for cilium-cli (scratch) image to run cilium by default

Signed-off-by: Merijn Keppel <merijnkeppel@gmail.com>
  • Loading branch information
leppeK authored and michi-covalent committed Sep 30, 2024
1 parent 6e326ee commit 3599042
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ RUN make

FROM scratch AS cilium-cli
COPY --from=builder /go/src/github.com/cilium/cilium-cli/cilium /usr/local/bin/cilium
ENTRYPOINT ["cilium"]

FROM ubuntu:24.04@sha256:dfc10878be8d8fc9c61cbff33166cb1d1fe44391539243703c72766894fa834a AS cilium-cli-ci
COPY --from=builder /go/src/github.com/cilium/cilium-cli/cilium /usr/local/bin/cilium
ENTRYPOINT []

# Install cloud CLIs. Based on these instructions:
# - https://cloud.google.com/sdk/docs/install#deb
Expand All @@ -40,4 +42,3 @@ RUN apt-get update -y \
FROM ${FINAL_CONTAINER}
LABEL maintainer="maintainer@cilium.io"
WORKDIR /root/app
ENTRYPOINT ["/usr/local/bin/cilium"]

0 comments on commit 3599042

Please sign in to comment.