File tree 4 files changed +18
-5
lines changed
cmd/opentelemetry-collector
4 files changed +18
-5
lines changed Original file line number Diff line number Diff line change 257
257
endif
258
258
259
259
.PHONY : build-otel-collector
260
- build-otel-collector :
260
+ build-otel-collector : elasticsearch-mappings
261
261
ifeq ($(GOARCH ) , s390x)
262
262
cd ${OTEL_COLLECTOR_DIR} && $(GOBUILD) -o ./opentelemetry-collector-$(GOOS)-$(GOARCH) $(BUILD_INFO) main.go
263
263
else
@@ -310,7 +310,7 @@ docker-images-elastic:
310
310
311
311
.PHONY : docker-images-jaeger-backend
312
312
docker-images-jaeger-backend :
313
- for component in agent collector query ingester ; do \
313
+ for component in agent collector query ingester opentelemetry-collector ; do \
314
314
docker build -t $(DOCKER_NAMESPACE ) /jaeger-$$ component:${DOCKER_TAG} cmd/$$ component ; \
315
315
echo " Finished building $$ component ==============" ; \
316
316
done
Original file line number Diff line number Diff line change
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" ]
Original file line number Diff line number Diff line change 20
20
fi
21
21
22
22
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
24
24
do
25
25
export REPO=" jaegertracing/jaeger-${component} "
26
26
bash ./scripts/travis/upload-to-docker.sh
Original file line number Diff line number Diff line change 34
34
# Do not enable echo before the `docker login` command to avoid revealing the password.
35
35
set -x
36
36
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
39
44
40
45
SNAPSHOT_IMAGE=" $REPO -snapshot:$TRAVIS_COMMIT "
41
46
echo " Pushing snapshot image $SNAPSHOT_IMAGE "
You can’t perform that action at this time.
0 commit comments