Compare commits

..

No commits in common. "be52cb21a7ea5c16db0d5f3b22f1864629ff36ae" and "d03c4a24ceb179d0fdb4c47e3d144d547ffcc8b6" have entirely different histories.

6 changed files with 32 additions and 29 deletions

View File

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

View File

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

View File

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

View File

@ -27,9 +27,6 @@ IF(LIBGCRYPTCONFIG_EXECUTABLE)
EXEC_PROGRAM(${LIBGCRYPTCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS) 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") IF(${LIBGCRYPT_CFLAGS} MATCHES "\n")
SET(LIBGCRYPT_CFLAGS " ") SET(LIBGCRYPT_CFLAGS " ")
ENDIF(${LIBGCRYPT_CFLAGS} MATCHES "\n") ENDIF(${LIBGCRYPT_CFLAGS} MATCHES "\n")

View File

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

View File

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