Skip to content

Commit

Permalink
Remove args and depict the image in From directive (#5465)
Browse files Browse the repository at this point in the history
<!--
!! Please DELETE this comment before posting.
We appreciate your contribution to the Jaeger project! πŸ‘‹πŸŽ‰
-->

## Which problem is this PR solving?
Fixes: #5450

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
  • Loading branch information
prakrit55 authored May 20, 2024
1 parent 3dbd02b commit 2eee293
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
7 changes: 2 additions & 5 deletions docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
ARG cert_image=alpine:3.19.0
ARG root_image=alpine:3.19.0

FROM $cert_image AS cert
FROM alpine:3.19.0 AS cert
RUN apk add --update --no-cache ca-certificates mailcap

FROM $root_image
FROM alpine:3.19.0
COPY --from=cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=cert /etc/mime.types /etc/mime.types
6 changes: 2 additions & 4 deletions docker/debug/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ARG golang_image=golang:1.22-alpine

FROM $golang_image AS build
FROM golang:1.22-alpine AS build
ARG TARGETARCH
ENV GOPATH /go
RUN apk add --update --no-cache ca-certificates make git build-base mailcap
Expand All @@ -12,7 +10,7 @@ RUN if [[ "$TARGETARCH" == "s390x" || "$TARGETARCH" == "ppc64le" ]] ; then \
go install github.com/go-delve/delve/cmd/dlv@latest; \
fi

FROM $golang_image
FROM golang:1.22-alpine
COPY --from=build /go/bin/dlv /go/bin/dlv
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=build /etc/mime.types /etc/mime.types

0 comments on commit 2eee293

Please sign in to comment.