From ab6880402fe4d5e307b3c3031a6241ee67636311 Mon Sep 17 00:00:00 2001 From: Eden Federman Date: Sun, 28 May 2023 17:05:05 +0300 Subject: [PATCH 1/4] Reduce docker image size --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6dbab74db..8ff7c9e0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,6 @@ WORKDIR /app COPY . . RUN make build -FROM registry.fedoraproject.org/fedora-minimal:38 +FROM cgr.dev/chainguard/glibc-dynamic:latest COPY --from=builder /app/otel-go-instrumentation / CMD ["/otel-go-instrumentation"] From 06752c5c5b45f378d63418d92dc77a43a0483fb0 Mon Sep 17 00:00:00 2001 From: Eden Federman Date: Sun, 28 May 2023 17:08:24 +0300 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e80dba1ed..8cbe6ed3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http - Upgrade OpenTelemetry semantic conventions to v1.18.0. ([#162](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/162)) - Remove the HTTP path from span names in `net/http`, `gin-gonic/gin`, and `gorilla/mux` instrumentations. ([#161](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/161)) +- Reduce Docker image size by using different base image. ([#182](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/182)) ## [v0.2.1-alpha] - 2023-05-15 From d061909a689672b3845f958768b3ab4622406e33 Mon Sep 17 00:00:00 2001 From: Eden Federman Date: Thu, 6 Jul 2023 14:30:07 +0300 Subject: [PATCH 3/4] update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ff7c9e0b..2223d50ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM fedora:38 as builder +FROM debian:11 as builder ARG TARGETARCH -RUN dnf install clang llvm make libbpf-devel -y +RUN apt-get update && apt-get install -y curl clang gcc llvm make libbpf-dev -y RUN curl -LO https://go.dev/dl/go1.20.linux-${TARGETARCH}.tar.gz && tar -C /usr/local -xzf go*.linux-${TARGETARCH}.tar.gz ENV PATH="/usr/local/go/bin:${PATH}" WORKDIR /app COPY . . RUN make build -FROM cgr.dev/chainguard/glibc-dynamic:latest +FROM gcr.io/distroless/base@sha256:73deaaf6a207c1a33850257ba74e0f196bc418636cada9943a03d7abea980d6d COPY --from=builder /app/otel-go-instrumentation / CMD ["/otel-go-instrumentation"] From b11bc87a300c460af15a6373e1303738fa9079f5 Mon Sep 17 00:00:00 2001 From: Eden Federman Date: Fri, 7 Jul 2023 00:27:02 -0700 Subject: [PATCH 4/4] Pin to base-debian11 Co-authored-by: Tyler Yahn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2223d50ed..2874d5c2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,6 @@ WORKDIR /app COPY . . RUN make build -FROM gcr.io/distroless/base@sha256:73deaaf6a207c1a33850257ba74e0f196bc418636cada9943a03d7abea980d6d +FROM gcr.io/distroless/base-debian11@sha256:73deaaf6a207c1a33850257ba74e0f196bc418636cada9943a03d7abea980d6d COPY --from=builder /app/otel-go-instrumentation / CMD ["/otel-go-instrumentation"]