search

jaegertracing / docker-protobuf

An all-inclusive protoc Docker image for the Jaeger project
https://hub.docker.com/r/jaegertracing/protobuf
Apache License 2.0
93 stars 35 forks source link

Rebase repository #18

Closed jpkrohling closed 4 years ago

jpkrohling commented 4 years ago

See #17 for context: if this looks good, I'll merge master and push it directly, as I'm sure squashing this PR will only cause more problems. For this case, we certainly want a proper rebase/merge.

jpkrohling commented 4 years ago

Image with this PR: quay.io/jpkroehling/jaeger-docker-protobuf:latest

yurishkuro commented 4 years ago

lgtm, but could you please describe the testing plan / steps.

annanay25 commented 4 years ago

Thanks for this PR @jpkrohling! Could you please fix the conflicts? That will make it easier to review.

jpkrohling commented 4 years ago

Thanks for this PR @jpkrohling! Could you please fix the conflicts? That will make it easier to review.

I don't think it's possible to fix it in a PR, but I'll try. The best would be to checkout this branch locally and run a git diff master.

Falco20019 commented 4 years ago

I don't think it's possible to fix it in a PR, but I'll try.

You should be able to fix it by merging master into this branch and solve the conflicts then.

pavolloffay commented 4 years ago

just FYI if somebody is interested I have built an image with this PR pavolloffay/jaeger-docker-protobuf:PR18

jpkrohling commented 4 years ago

I'm closing this, as we'll probably not work on rebasing it this way.