docker: install googletest via package manager

fixes #2895
ElektraInitiative · Sep 8, 2019 · 9b6aed4 · 9b6aed4
1 parent d92eb59
commit 9b6aed4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 33 deletions.
diff --git a/scripts/docker/debian/buster/Dockerfile b/scripts/docker/debian/buster/Dockerfile
@@ -39,7 +39,7 @@ RUN apt-get update \
         libgit2-dev \
         libglib2.0-dev \
         libgpgme-dev \
-        libgtest-dev \
+        googletest \
         liblua5.3-dev \
         libmarkdown2-dev \
         libpcre++-dev \

diff --git a/scripts/docker/debian/buster/doc.Dockerfile b/scripts/docker/debian/buster/doc.Dockerfile
@@ -11,6 +11,7 @@ RUN apt-get -y install \
         doxygen \
         graphviz \
         ronn \
+        googletest \
         ruby \
         ruby-dev \
         sloccount \
@@ -21,16 +22,6 @@ RUN apt-get -y install \
     && gem install apiaryio \
     && rm -rf /var/lib/apt/lists/*
 
-# Google Test
-ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=release-1.8.1
-RUN mkdir -p ${GTEST_ROOT} \
-    && cd /tmp \
-    && curl -o gtest.tar.gz \
-      -L https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz \
-    && tar -zxvf gtest.tar.gz --strip-components=1 -C ${GTEST_ROOT} \
-    && rm gtest.tar.gz
-
 # Create User:Group
 # The id is important as jenkins docker agents use the same id that is running
 # on the slaves to execute containers

diff --git a/scripts/docker/debian/buster/i386.Dockerfile b/scripts/docker/debian/buster/i386.Dockerfile
@@ -12,22 +12,13 @@ RUN dpkg --add-architecture i386 \
         autotools-dev \
         automake \
         cmake \
+        googletest \
         pkg-config \
         gcc-multilib \
         g++-multilib \
         file \
     && rm -rf /var/lib/apt/lists/*
 
-# Google Test
-ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=release-1.8.1
-RUN mkdir -p ${GTEST_ROOT} \
-    && cd /tmp \
-    && curl -o gtest.tar.gz \
-      -L https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz \
-    && tar -zxvf gtest.tar.gz --strip-components=1 -C ${GTEST_ROOT} \
-    && rm gtest.tar.gz
-
 # Handle Java
 RUN echo 'export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")'>> /etc/bash.bashrc
 RUN echo '\

diff --git a/scripts/docker/debian/buster/minimal.Dockerfile b/scripts/docker/debian/buster/minimal.Dockerfile
@@ -5,17 +5,7 @@ ENV LANGUAGE C.UTF-8
 ENV LC_ALL C.UTF-8
 
 RUN apt-get update && apt-get -y install \
-    cmake git build-essential curl file
-
-# Google Test
-ENV GTEST_ROOT=/opt/gtest
-ARG GTEST_VER=release-1.8.1
-RUN mkdir -p ${GTEST_ROOT} \
-    && cd /tmp \
-    && curl -o gtest.tar.gz \
-      -L https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz \
-    && tar -zxvf gtest.tar.gz --strip-components=1 -C ${GTEST_ROOT} \
-    && rm gtest.tar.gz
+    cmake git build-essential curl file googletest
 
 # Create User:Group
 # The id is important as jenkins docker agents use the same id that is running

diff --git a/scripts/jenkins/Jenkinsfile b/scripts/jenkins/Jenkinsfile
@@ -56,7 +56,8 @@ CMAKE_FLAGS_BASE = [
   'CMAKE_INSTALL_PREFIX': '${WORKSPACE}/system',
   'BUILD_DOCUMENTATION': 'OFF',
   'CMAKE_RULE_MESSAGES': 'OFF',
-  'COMMON_FLAGS': '-Werror'
+  'COMMON_FLAGS': '-Werror',
+  'GTEST_ROOT': '/usr/src/googletest/googletest'
 ]
 
 CMAKE_FLAGS_BUILD_ALL = [