Skip to content
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

Remove args and depict the image in From directive #5465

Merged
merged 10 commits into from
May 20, 2024
Merged

Remove args and depict the image in From directive #5465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3570f0b
Update Makefile
prakrit55 May 15, 2024
44b068c
Update Makefile
prakrit55 May 15, 2024
3721805
Update Dockerfile
prakrit55 May 15, 2024
e34f3d0
Update Makefile
prakrit55 May 15, 2024
7f76b24
Update Dockerfile
prakrit55 May 15, 2024
bfba358
Update check-go-version.sh
prakrit55 May 16, 2024
3299b00
Update check-go-version.sh
prakrit55 May 16, 2024
047c5b2
Merge branch 'jaegertracing:main' into fix-alpine-image
prakrit55 May 20, 2024
cd595e3
Update Dockerfile
prakrit55 May 20, 2024
217bb7f
Update Dockerfile
prakrit55 May 20, 2024
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
7 changes: 2 additions & 5 deletions docker/base/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
Loading