From 239a266f1e17efac2fe9008b34ac1b5e27c02120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E6=A5=BD=E5=9D=82=E5=B8=95=E7=90=AA?= Date: Wed, 8 Jan 2020 07:45:14 +0800 Subject: [PATCH] Update Dockerfile to make it works 1. maintainer tag 2. googletest install method update 3. datadogsync.py not exist --- Docker/Dockerfile | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 7e65dc4..7094a45 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,5 +1,6 @@ FROM centos:7 -MAINTAINER ben@perimeterx.com + +LABEL maintainer="ben@perimeterx.com" ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en @@ -11,17 +12,12 @@ RUN yum -y install git libasan snappy-devel boost-devel rpm-build wget unzip soc RUN wget "http://downloads.sourceforge.net/project/scons/scons/2.3.6/scons-2.3.6-1.noarch.rpm?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fscons%2Ffiles%2Fscons%2F2.3.6%2F&ts=1439720375&use_mirror=skylineservers" -O scons.rpm && \ rpm -i scons.rpm -RUN wget http://googletest.googlecode.com/files/gtest-1.7.0.zip && \ - unzip gtest-1.7.0.zip && \ - cd gtest-1.7.0 && \ - ./configure && \ - make && \ - cd lib/.libs && \ - mkdir -p /usr/lib64 && \ - mv *.a *.lai *.so* ../*.la /usr/lib64 && \ - ldconfig && \ - cd ../.. && \ - cp -a include/gtest /usr/include +RUN yum -y install cmake make g++ +RUN git clone https://github.com/google/googletest.git /googletest && \ + mkdir -p /googletest/build && \ + cd /googletest/build && \ + cmake .. && make && make install && \ + cd / && rm -rf /googletest RUN cd /root && \ git clone https://github.com/ifwe/bruce.git && \ @@ -31,17 +27,10 @@ RUN cd /root && \ mkdir -p /opt/bruce/bin/ && \ cp /root/bruce/out/release/bruce/bruce /opt/bruce/bin/ - -RUN wget http://peak.telecommunity.com/dist/ez_setup.py -RUN python ez_setup.py -RUN easy_install pip -ADD datadogsync.py /root/ -RUN pip install datadog - RUN mkdir -p /etc/bruce ADD bruce_conf.xml /etc/bruce/ ADD start.sh /etc/bruce/ EXPOSE 9090 -CMD sh /etc/bruce/start.sh \ No newline at end of file +CMD sh /etc/bruce/start.sh