Skip to content

Commit

Permalink
add jaeger dependencies as submodules
Browse files Browse the repository at this point in the history
- add specific version of dependencies required
	- Opentracing: 1.5.x
	- Jaeger: 0.5.0
	- yaml-cpp:
	-Thrift: 0.11.0
- src/jaegertracing/: add jaeger-client-cpp and
it's dependencies as submodules.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
  • Loading branch information
Deepika Upadhyay committed Dec 16, 2019
1 parent ccbd558 commit 958e4c4
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 14 deletions.
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,12 @@
[submodule "src/c-ares"]
path = src/c-ares
url = https://github.com/ceph/c-ares.git
[submodule "src/jaegertracing/jaeger-dependencies/opentracing-cpp"]
path = src/jaegertracing/jaeger-dependencies/opentracing-cpp
url = https://github.com/opentracing/opentracing-cpp.git
[submodule "src/jaegertracing/jaeger-client-cpp"]
path = src/jaegertracing/jaeger-client-cpp
url = https://github.com/jaegertracing/jaeger-client-cpp.git
[submodule "src/jaegertracing/jaeger-dependencies/thrift"]
path = src/jaegertracing/jaeger-dependencies/thrift
url = https://github.com/apache/thrift.git
18 changes: 4 additions & 14 deletions jaegertracing/Dockerfile → src/jaegertracing/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ LABEL maintainer="dupadhya@redhat.com"

# general utilities
RUN apt-get update && apt-get install -y \
bash vim git wget curl zsh
bash vim git wget curl zsh
RUN apt-get install -y apt-utils gcc make cmake \
software-properties-common sudo gdb
software-properties-common sudo gdb

# jaeger-dependencies
RUN apt-get install -y apt-utils libyaml-cpp-dev libgtest-dev \
Expand All @@ -18,7 +18,7 @@ RUN apt-get install -y apt-utils libyaml-cpp-dev libgtest-dev \
RUN sudo ln -s /usr/lib/x86_64-linux-gnu/libboost_unit_test_framework.a \
/usr/local/lib/libboost_unit_test_framework.a

# jaeger dependencies that needs build from source
# jaeger dependencies that needs build from source
RUN wget http://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz \
&& tar -xzf thrift-0.11.0.tar.gz \
&& cd thrift-0.11.0 \
Expand All @@ -35,7 +35,7 @@ RUN git clone https://github.com/nlohmann/json.git \
&& cd build \
&& cmake -DBUILD_SHARED_LIBS=ON .. \
&& make -j$(nproc) \
&& sudo make install
&& sudo make install

RUN git clone https://github.com/opentracing/opentracing-cpp.git \
&& cd opentracing-cpp \
Expand All @@ -53,15 +53,5 @@ RUN git clone https://github.com/jaegertracing/jaeger-client-cpp.git \
&& cmake -DBUILD_TESTING=OFF -DHUNTER_ENABLED=OFF .. \
&& make -j$(nproc) \
&& sudo make install

ADD /shared/docker/ /docker

# oh-my-zsh
ENV ZSH_DISABLE_COMPFIX true
RUN wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | zsh || true
ENV CEPH_ROOT /ceph

VOLUME ["/ceph"]
VOLUME ["/shared"]

CMD ["zsh"]
File renamed without changes.
6 changes: 6 additions & 0 deletions src/jaegertracing/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
disabled: false
reporter:
logSpans: true
sampler:
type: const
param: 1
1 change: 1 addition & 0 deletions src/jaegertracing/jaeger-client-cpp
Submodule jaeger-client-cpp added at 741b1a
1 change: 1 addition & 0 deletions src/jaegertracing/jaeger-dependencies/opentracing-cpp
Submodule opentracing-cpp added at 4bb431
1 change: 1 addition & 0 deletions src/jaegertracing/jaeger-dependencies/thrift
Submodule thrift added at 6e4437
File renamed without changes.

0 comments on commit 958e4c4

Please sign in to comment.