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

[chore] Consolidate Docker image names #155

Closed
wants to merge 9 commits into from
Closed

[chore] Consolidate Docker image names #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e7591f9
Consolidate Docker image names
MasonLegere May 11, 2023
7d99318
Correct CI Docker image
MasonLegere May 15, 2023
3d959c9
Merge branch 'main' into consolidate-image-name
MasonLegere May 15, 2023
74122dd
Correct go build name
MasonLegere May 15, 2023
16822c1
Merge branch 'consolidate-image-name' of github.com:MasonLegere/opent…
MasonLegere May 15, 2023
b4829cf
Remove package name changes
MasonLegere May 17, 2023
1d2e911
Merge branch 'main' into consolidate-image-name
MikeGoldsmith May 24, 2023
0ba509c
Correct reference to pid stop
MasonLegere May 24, 2023
7c2bf1a
Merge branch 'consolidate-image-name' of github.com:MasonLegere/opent…
MasonLegere May 24, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/e2e/k8s/sample-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ spec:
image: sample-app
imagePullPolicy: IfNotPresent
command: ["/bin/sh", "-c"]
# send SIGTERM to otel-go-instrumentation once the sample app has generated data so the job completes.
args: ["/sample-app/main && kill -TERM $(pidof otel-go-instrumentation)"]
# send SIGTERM to otel-autoinstrumentation-go once the sample app has generated data so the job completes.
args: ["/sample-app/main && kill -TERM $(pidof otel-autoinstrumentation-go)"]
- name: auto-instrumentation
image: otel-go-instrumentation
image: otel-autoinstrumentation-go
imagePullPolicy: IfNotPresent
env:
- name: OTEL_GO_AUTO_TARGET_EXE
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: mig4/setup-bats@v1
- name: Build auto-instrumentation
run: |
IMG=otel-go-instrumentation:latest make docker-build
IMG=otel-autoinstrumentation-go:latest make docker-build
- name: Build sample app
run: |
cd test/e2e/${{ matrix.library }}
Expand All @@ -47,7 +47,7 @@ jobs:
docker ps -a --filter label=io.x-k8s.kind.cluster=chart-testing
- name: Kind load images
run: |
kind load docker-image otel-go-instrumentation --name chart-testing
kind load docker-image otel-autoinstrumentation-go --name chart-testing
kind load docker-image sample-app --name chart-testing
- name: Add Dependencies
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
contents: read
packages: write
env:
IMAGE_NAME: autoinstrumentation-go
IMAGE_NAME: otel-autoinstrumentation-go
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will make the docker image otel/otel-autoinstrumentation-go. Do we want the stutter in the name?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, no I don't think the additional otel prefix.

steps:
- uses: actions/checkout@v3.5.2

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ COPY . .
RUN make build

FROM registry.fedoraproject.org/fedora-minimal:38
COPY --from=builder /app/otel-go-instrumentation /
COPY --from=builder /app/ otel-go-instrumentation/
CMD ["/otel-go-instrumentation"]
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $(TOOLS)/multimod: PACKAGE=go.opentelemetry.io/build-tools/multimod
GOLICENSES = $(TOOLS)/go-licenses
$(TOOLS)/go-licenses: PACKAGE=github.com/google/go-licenses

IMG_NAME ?= otel-go-instrumentation
IMG_NAME ?= otel-autoinstrumentation-go

GOLANGCI_LINT = $(TOOLS)/golangci-lint
$(TOOLS)/golangci-lint: PACKAGE=github.com/golangci/golangci-lint/cmd/golangci-lint
Expand Down Expand Up @@ -127,7 +127,7 @@ fixtures/%:
$(MAKE) docker-build
cd test/e2e/$(LIBRARY) && docker build -t sample-app .
kind create cluster
kind load docker-image otel-go-instrumentation sample-app
kind load docker-image $(IMG_NAME) sample-app
helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
if [ ! -d "opentelemetry-helm-charts" ]; then \
git clone https://github.com/open-telemetry/opentelemetry-helm-charts.git; \
Expand Down