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

Build remote-storage #3841

Merged
merged 2 commits into from Aug 2, 2022
Merged

Build remote-storage #3841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79f360e
Build remote-storage
yurishkuro Aug 2, 2022
703d040
fix-docker-file
yurishkuro Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -24,6 +24,8 @@ cmd/collector/collector
cmd/collector/collector-*
cmd/ingester/ingester
cmd/ingester/ingester-*
cmd/remote-storage/remote-storage
cmd/remote-storage/remote-storage-*
cmd/es-index-cleaner/es-index-cleaner-*
cmd/es-rollover/es-rollover-*
cmd/query/query
Expand All @@ -38,4 +40,3 @@ crossdock/crossdock-*
run-crossdock.log
proto-gen/.patched-otel-proto/
__pycache__

11 changes: 9 additions & 2 deletions Makefile
View file
Open in desktop
Expand Up @@ -216,8 +216,8 @@ rebuild-ui:
build-all-in-one-linux:
GOOS=linux $(MAKE) build-all-in-one

build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug: DISABLE_OPTIMIZATIONS = -gcflags="all=-N -l"
build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug: SUFFIX = -debug
build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug build-remote-storage-debug: DISABLE_OPTIMIZATIONS = -gcflags="all=-N -l"
build-all-in-one-debug build-agent-debug build-query-debug build-collector-debug build-ingester-debug build-remote-storage-debug: SUFFIX = -debug

.PHONY: build-all-in-one build-all-in-one-debug
build-all-in-one build-all-in-one-debug: build-ui
Expand All @@ -239,6 +239,10 @@ build-collector build-collector-debug:
build-ingester build-ingester-debug:
$(GOBUILD) $(DISABLE_OPTIMIZATIONS) -o ./cmd/ingester/ingester$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/ingester/main.go

.PHONY: build-remote-storage build-remote-storage-debug
build-remote-storage build-remote-storage-debug:
$(GOBUILD) $(DISABLE_OPTIMIZATIONS) -o ./cmd/remote-storage/remote-storage$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/remote-storage/main.go

.PHONY: build-binaries-linux
build-binaries-linux:
GOOS=linux GOARCH=amd64 $(MAKE) build-platform-binaries
Expand Down Expand Up @@ -276,7 +280,10 @@ build-platform-binaries: build-agent \
build-query-debug \
build-ingester \
build-ingester-debug \
build-remote-storage \
build-remote-storage-debug \
build-all-in-one \
build-all-in-one-debug \
build-examples \
build-tracegen \
build-anonymizer \
Expand Down
8 changes: 4 additions & 4 deletions cmd/remote-storage/Dockerfile
View file
Open in desktop
Expand Up @@ -5,12 +5,12 @@ ARG SVC=remote-storage

FROM $base_image AS release
ARG TARGETARCH
COPY $SVC-linux-$TARGETARCH /go/bin/$SVC-linux
COPY remote-storage-linux-$TARGETARCH /go/bin/remote-storage-linux
EXPOSE 16686/tcp
ENTRYPOINT ["/go/bin/$SVC-linux"]
ENTRYPOINT ["/go/bin/remote-storage-linux"]

FROM $debug_image AS debug
ARG TARGETARCH=amd64
COPY $SVC-debug-linux-$TARGETARCH /go/bin/$SVC-linux
COPY remote-storage-debug-linux-$TARGETARCH /go/bin/remote-storage-linux
EXPOSE 12345/tcp 16686/tcp
ENTRYPOINT ["/go/bin/dlv", "exec", "/go/bin/$SVC-linux", "--headless", "--listen=:12345", "--api-version=2", "--accept-multiclient", "--log", "--"]
ENTRYPOINT ["/go/bin/dlv", "exec", "/go/bin/remote-storage-linux", "--headless", "--listen=:12345", "--api-version=2", "--accept-multiclient", "--log", "--"]
19 changes: 4 additions & 15 deletions scripts/build-upload-docker-images.sh
View file
Open in desktop
Expand Up @@ -13,30 +13,19 @@ make build-binaries-arm64
# build multi-arch docker images
platforms="linux/amd64,linux/s390x,linux/ppc64le,linux/arm64"

# build/upload images for release version of Jaeger backend components
for component in agent collector query ingester
# build/upload raw and debug images of Jaeger backend components
for component in agent collector query ingester remote-storage
do
bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -t release
bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}-debug" -d "cmd/${component}" -t debug
done

# build/upload images for jaeger-es-index-cleaner and jaeger-es-rollover
bash scripts/build-upload-a-docker-image.sh -b -c jaeger-es-index-cleaner -d cmd/es-index-cleaner -p "${platforms}" -t release
bash scripts/build-upload-a-docker-image.sh -b -c jaeger-es-rollover -d cmd/es-rollover -p "${platforms}" -t release
bash scripts/build-upload-a-docker-image.sh -c jaeger-cassandra-schema -d plugin/storage/cassandra/

# build/upload images for jaeger-tracegen and jaeger-anonymizer
for component in tracegen anonymizer
do
bash scripts/build-upload-a-docker-image.sh -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}"
done


# build amd64 docker images

# build/upload images for debug version of Jaeger backend components
for component in agent collector query ingester
do
bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}-debug" -d "cmd/${component}" -t debug
done

# build/upload images for jaeger-cassandra-schema
bash scripts/build-upload-a-docker-image.sh -c jaeger-cassandra-schema -d plugin/storage/cassandra/