Commit 05347e1c authored by Vaastav Anand's avatar Vaastav Anand

Add x-trace docker changes to mediaMicroservices

parent be7739c6
FROM yg397/thrift-microservice-deps:xenial
FROM yg397/thrift-microservice-deps:latest
ARG NUM_CPUS=40
ARG NUM_CPUS=12
COPY ./ /media-microservices
RUN cd /media-microservices \
......@@ -10,4 +10,4 @@ RUN cd /media-microservices \
&& make -j${NUM_CPUS} \
&& make install
WORKDIR /media-microservices
\ No newline at end of file
WORKDIR /media-microservices
......@@ -14,7 +14,7 @@ ARG JAEGER_TRACING_VERSION="0.4.2"
ARG NGINX_OPENTRACING_VERSION="0.8.0"
ARG OPENTRACING_CPP_VERSION="1.5.1"
ARG RESTY_J="1"
ARG NUM_CPUS="40"
ARG NUM_CPUS="12"
ARG RESTY_CONFIG_OPTIONS="\
--with-file-aio \
--with-http_addition_module \
......@@ -78,6 +78,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
ca-certificates \
curl \
git \
wget \
gettext-base \
libgd-dev \
libgeoip-dev \
......@@ -201,6 +202,39 @@ RUN luarocks install long \
&& luarocks install lua-resty-jwt \
&& ldconfig
RUN apt-get update \
&& apt-get install -y libboost-all-dev
RUN apt-get install -y lua5.1 lua5.1-dev
RUN cd /tmp \
&& wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz \
&& gunzip protobuf-2.5.0.tar.gz \
&& tar -xvf protobuf-2.5.0.tar \
&& cd protobuf-2.5.0 \
&& ./configure --prefix=/usr \
&& make \
&& make install \
&& ldconfig \
# Install xtrace
&& cd /tmp \
&& git clone https://github.com/JonathanMace/xtrace-cpp.git \
&& cd xtrace-cpp \
&& mkdir build \
&& cd build \
&& cmake .. \
&& make \
&& make install \
&& cd /tmp \
&& rm -rf \
protobuf-2.5.0.tar \
protobuf-2.5.0 \
xtrace-cpp
RUN cp /usr/local/lib/luaxtrace.so /usr/local/openresty/lualib/luaxtrace.so
ENV LD_LIBRARY_PATH /usr/local/lib:/usr/lib:/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}
RUN ldconfig
# Copy nginx configuration files
COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
......
......@@ -9,7 +9,7 @@ ARG LIB_OPENTRACING_VERSION=1.5.1
ARG LIB_CPP_JWT_VERSION=1.1.1
ARG LIB_CPP_REDIS_VERSION=4.3.1
ARG NUM_CPUS=40
ARG NUM_CPUS=12
ARG BUILD_DEPS="ca-certificates g++ cmake wget git libmemcached-dev automake bison flex libboost-all-dev libevent-dev libssl-dev libtool make pkg-config"
RUN apt-get update \
......@@ -109,5 +109,30 @@ RUN apt-get update \
cpp-jwt-${LIB_CPP_JWT_VERSION} \
cpp_redis
RUN apt-get install -y lua5.1 lua5.1-dev
RUN cd /tmp \
&& wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz \
&& gunzip protobuf-2.5.0.tar.gz \
&& tar -xvf protobuf-2.5.0.tar \
&& cd protobuf-2.5.0 \
&& ./configure --prefix=/usr \
&& make \
&& make install \
# Install xtrace
&& cd /tmp \
&& git clone https://github.com/JonathanMace/xtrace-cpp.git \
&& cd xtrace-cpp \
&& mkdir build \
&& cd build \
&& cmake .. \
&& make \
&& make install \
&& cd /tmp \
&& rm -rf \
protobuf-2.5.0.tar \
protobuf-2.5.0 \
xtrace-cpp
ENV LD_LIBRARY_PATH /usr/local/lib:${LD_LIBRARY_PATH}
RUN ldconfig
\ No newline at end of file
RUN ldconfig
FROM yg397/thrift-microservice-deps:latest
ARG NUM_CPUS=40
ARG NUM_CPUS=12
COPY ./ /social-network-microservices
RUN cd /social-network-microservices \
......@@ -10,4 +10,4 @@ RUN cd /social-network-microservices \
&& make -j${NUM_CPUS} \
&& make install
WORKDIR /social-network-microservices
\ No newline at end of file
WORKDIR /social-network-microservices
......@@ -14,7 +14,7 @@ ARG JAEGER_TRACING_VERSION="0.4.2"
ARG NGINX_OPENTRACING_VERSION="0.8.0"
ARG OPENTRACING_CPP_VERSION="1.5.1"
ARG RESTY_J="1"
ARG NUM_CPUS="40"
ARG NUM_CPUS="12"
ARG RESTY_CONFIG_OPTIONS="\
--with-file-aio \
--with-http_addition_module \
......
......@@ -11,7 +11,7 @@ ARG LIB_CPP_REDIS_VERSION=4.3.1
ARG LIB_AMQP_CPP_VERSION=4.1.4
ARG LIB_SIMPLEAMQPCLIENT_VERSION=2.4.0
ARG NUM_CPUS=40
ARG NUM_CPUS=12
ARG BUILD_DEPS="ca-certificates g++ cmake wget git libmemcached-dev automake bison flex libboost-all-dev libevent-dev libssl-dev libtool make pkg-config librabbitmq-dev"
RUN apt-get update \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment