Remove libdl build requirement

reduce docker image size even more

.dockerignore

@@ -1,4 +1,5 @@
-.git
-Dockerfile
-.dockerignore
-.gitignore
+*
+!cmake
+!grive
+!libgrive
+!CMakeLists.txt

Dockerfile

@@ -1,27 +1,25 @@
 FROM alpine:3.7 as build
 
-RUN apk add git make cmake g++ libgcrypt-dev yajl-dev yajl \
-    boost-dev curl-dev expat-dev cppunit-dev binutils-dev \
-	pkgconfig \
-	&& git clone https://github.com/vitalif/grive2.git \
-	&& mkdir grive2/build \
-	&& cd grive2/build  \
-	&& cmake ..  \
-	&& make -j4  \
-	&& make install \
-    && cd ../.. \
-	&& rm -rf grive2 \
-	&& mkdir /drive
+RUN apk add make cmake g++ libgcrypt-dev yajl-dev yajl \
+	boost-dev curl-dev expat-dev cppunit-dev binutils-dev \
+	pkgconfig
+
+ADD . /grive2
+
+RUN mkdir /grive2/build \
+	&& cd /grive2/build \
+	&& cmake .. \
+	&& make -j4 install
 
 FROM alpine:3.7
-COPY --from=build /usr/local/bin/grive /bin/grive
-ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 /bin/dumb-init
-RUN chmod 777 /bin/dumb-init /bin/grive \
-	&& mkdir /data \
-	&& apk add yajl-dev curl-dev libgcrypt \
-	boost-program_options boost-regex libstdc++ boost-system boost-dev binutils-dev \
+
+RUN apk add yajl libcurl libgcrypt boost-program_options boost-regex libstdc++ boost-system \
 	&& apk add boost-filesystem --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 
+COPY --from=build /usr/local/bin/grive /bin/grive
+RUN chmod 777 /bin/grive \
+	&& mkdir /data
+
 VOLUME /data
 WORKDIR /data
-ENTRYPOINT ["dumb-init", "grive"]
+ENTRYPOINT grive

cmake/Modules/FindBFD.cmake

@@ -1,12 +1,6 @@
-find_library( DL_LIBRARY 	NAMES dl	PATH ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} )
 find_library( BFD_LIBRARY	NAMES bfd	PATH ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES} )
 
-if ( DL_LIBRARY AND BFD_LIBRARY )
+if ( BFD_LIBRARY )
 	set( BFD_FOUND TRUE )
-endif (DL_LIBRARY AND BFD_LIBRARY)
-
-if ( BFD_FOUND )
-
 	message( STATUS "Found libbfd: ${BFD_LIBRARY}")
-
-endif ( BFD_FOUND )
+endif ( BFD_LIBRARY )

cmake/Modules/FindLibGcrypt.cmake

@@ -27,6 +27,9 @@ IF(LIBGCRYPTCONFIG_EXECUTABLE)
 
   EXEC_PROGRAM(${LIBGCRYPTCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS)
 
+  string(REPLACE "fgrep: warning: fgrep is obsolescent; using grep -F" "" LIBGCRYPT_LIBRARIES "${LIBGCRYPT_LIBRARIES}")
+  string(STRIP "${LIBGCRYPT_LIBRARIES}" LIBGCRYPT_LIBRARIES)
+
   IF(${LIBGCRYPT_CFLAGS} MATCHES "\n")
     SET(LIBGCRYPT_CFLAGS " ")
   ENDIF(${LIBGCRYPT_CFLAGS} MATCHES "\n")

libgrive/CMakeLists.txt

@@ -22,7 +22,7 @@ ENDIF ( CPPUNIT_FOUND )
 
 # build bfd classes if libbfd and the backtrace library is found
 if ( BFD_FOUND AND Backtrace_FOUND )
-	set( OPT_LIBS	${DL_LIBRARY} ${BFD_LIBRARY} ${Backtrace_LIBRARY} )
+	set( OPT_LIBS	${BFD_LIBRARY} ${Backtrace_LIBRARY} )
 	file( GLOB OPT_SRC
 		src/bfd/*.cc
 	)

libgrive/src/base/Syncer.hh

@@ -21,6 +21,7 @@
 
 #include "util/FileSystem.hh"
 
+#include <memory>
 #include <string>
 #include <vector>
 #include <iosfwd>