Skip to content

Commit 7ee7073

Browse files
authored
Add Dockerfile for OTEL collector and publish latest tag (#2167)
* Add Dockerfile for OTEL collector and publish latest tag Signed-off-by: Pavol Loffay <ploffay@redhat.com> * Remove line Signed-off-by: Pavol Loffay <ploffay@redhat.com> * no cache for the certs Signed-off-by: Pavol Loffay <ploffay@redhat.com>
1 parent b8f6ac1 commit 7ee7073

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ else
257257
endif
258258

259259
.PHONY: build-otel-collector
260-
build-otel-collector:
260+
build-otel-collector: elasticsearch-mappings
261261
ifeq ($(GOARCH), s390x)
262262
cd ${OTEL_COLLECTOR_DIR} && $(GOBUILD) -o ./opentelemetry-collector-$(GOOS)-$(GOARCH) $(BUILD_INFO) main.go
263263
else
@@ -310,7 +310,7 @@ docker-images-elastic:
310310

311311
.PHONY: docker-images-jaeger-backend
312312
docker-images-jaeger-backend:
313-
for component in agent collector query ingester ; do \
313+
for component in agent collector query ingester opentelemetry-collector ; do \
314314
docker build -t $(DOCKER_NAMESPACE)/jaeger-$$component:${DOCKER_TAG} cmd/$$component ; \
315315
echo "Finished building $$component ==============" ; \
316316
done
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM alpine:latest as certs
2+
RUN apk add --update --no-cache ca-certificates
3+
4+
FROM scratch
5+
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
6+
7+
COPY opentelemetry-collector-linux /go/bin/
8+
ENTRYPOINT ["/go/bin/opentelemetry-collector-linux"]

scripts/travis/upload-all-docker-images.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ else
2020
fi
2121

2222
export DOCKER_NAMESPACE=jaegertracing
23-
for component in agent cassandra-schema es-index-cleaner es-rollover collector query ingester tracegen
23+
for component in agent cassandra-schema es-index-cleaner es-rollover collector query ingester tracegen opentelemetry-collector
2424
do
2525
export REPO="jaegertracing/jaeger-${component}"
2626
bash ./scripts/travis/upload-to-docker.sh

scripts/travis/upload-to-docker.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,13 @@ fi
3434
# Do not enable echo before the `docker login` command to avoid revealing the password.
3535
set -x
3636
docker login -u $DOCKER_USER -p $DOCKER_PASS
37-
# push all tags, therefore push to repo
38-
docker push $REPO
37+
if [[ "${REPO}" == "jaegertracing/jaeger-opentelemetry-collector" ]]; then
38+
# TODO remove once Jaeger OTEL collector is stable
39+
docker push $REPO:latest
40+
else
41+
# push all tags, therefore push to repo
42+
docker push $REPO
43+
fi
3944

4045
SNAPSHOT_IMAGE="$REPO-snapshot:$TRAVIS_COMMIT"
4146
echo "Pushing snapshot image $SNAPSHOT_IMAGE"

0 commit comments

Comments
 (0)