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

Jump to bottom

Add base Dockerfile and add caching for go build #683

Merged
merged 7 commits into from
Feb 26, 2024
Merged

Add base Dockerfile and add caching for go build #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4b7890
Add base Dockerfile for apt packages, and add caching for go build
RonFed Feb 21, 2024
ecef7bf
changelog
RonFed Feb 21, 2024
3a0564e
new line
RonFed Feb 22, 2024
1ea484d
Merge branch 'main' into base_dockerfile
RonFed Feb 22, 2024
9110968
Use multi stage Dockerfile
RonFed Feb 22, 2024
e8d699f
Merge branch 'main' into base_dockerfile
RonFed Feb 22, 2024
ef9f4c1
Merge branch 'main' into base_dockerfile
damemi Feb 26, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
### Added

- Test build using [Go 1.22]. (#672)
- Base Dockerfile and build caching ([#683](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/683))

### Fixed

Expand Down
10 changes: 7 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.0-bullseye as builder
FROM golang:1.22.0-bullseye as base

WORKDIR /app

Expand All @@ -7,10 +7,14 @@ RUN apt-get update && apt-get install -y curl clang gcc llvm make libbpf-dev
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading
# them in subsequent builds if they change
COPY go.mod go.sum ./
RUN go mod download && go mod verify
RUN --mount=type=cache,target=/go/pkg \
go mod download && go mod verify

FROM base as builder
COPY . .
RUN make build
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg \
make build

FROM gcr.io/distroless/base-debian12@sha256:5eae9ef0b97acf7de819f936e12b24976b2d54333a2cf329615366e16ba598cd
COPY --from=builder /app/otel-go-instrumentation /
Expand Down
17 changes: 13 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ DBOTCONF = $(TOOLS)/dbotconf
$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/build-tools/dbotconf

IMG_NAME ?= otel-go-instrumentation
IMG_NAME_BASE = $(IMG_NAME)-base

GOLANGCI_LINT = $(TOOLS)/golangci-lint
$(TOOLS)/golangci-lint: PACKAGE=github.com/golangci/golangci-lint/cmd/golangci-lint
Expand All @@ -64,12 +65,16 @@ generate:
$(GOCMD) generate ./...

.PHONY: docker-generate
docker-generate:
docker run --rm -v $(shell pwd):/app golang:1.20 /bin/sh -c "apt-get update && apt-get install -y clang llvm libbpf-dev && cd ../app && make generate"
docker-generate: docker-build-base
docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd ../app && make generate"

.PHONY: docker-test
docker-test:
docker run --rm -v $(shell pwd):/app golang:1.20 /bin/sh -c "apt-get update && apt-get install -y clang llvm libbpf-dev && cd ../app && make test"
docker-test: docker-build-base
docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd ../app && make test"

.PHONY: docker-precommit
docker-precommit: docker-build-base
docker run --rm -v $(shell pwd):/app $(IMG_NAME_BASE) /bin/sh -c "cd ../app && make precommit"

.PHONY: go-mod-tidy
go-mod-tidy: $(ALL_GO_MOD_DIRS:%=go-mod-tidy/%)
Expand All @@ -95,6 +100,10 @@ build: generate
docker-build:
docker buildx build -t $(IMG_NAME) .

.PHONY: docker-build-base
docker-build-base:
docker buildx build -t $(IMG_NAME_BASE) --target base .

OFFSETS_OUTPUT_FILE="$(REPODIR)/internal/pkg/inject/offset_results.json"
.PHONY: offsets
offsets: | $(OFFSETGEN)
Expand Down
Loading