Skip to content

Commit 648ff8e

Browse files
committed
Cache layers during Docker build, take source from the current dir instead of cloning
1 parent eb82bfe commit 648ff8e

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

.dockerignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
*
1+
*
2+
!cmake
3+
!grive
4+
!libgrive
5+
!CMakeLists.txt

Dockerfile

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
FROM alpine:3.7 as build
22

3-
RUN apk add git make cmake g++ libgcrypt-dev yajl-dev yajl \
3+
RUN apk add make cmake g++ libgcrypt-dev yajl-dev yajl \
44
boost-dev curl-dev expat-dev cppunit-dev binutils-dev \
5-
pkgconfig \
6-
&& git clone https://github.com/vitalif/grive2.git \
7-
&& mkdir grive2/build \
8-
&& cd grive2/build \
9-
&& cmake .. \
10-
&& make -j4 \
11-
&& make install \
12-
&& cd ../.. \
13-
&& rm -rf grive2 \
14-
&& mkdir /drive
5+
pkgconfig
6+
7+
ADD . /grive2
8+
9+
RUN mkdir /grive2/build \
10+
&& cd /grive2/build \
11+
&& cmake .. \
12+
&& make -j4 install
1513

1614
FROM alpine:3.7
17-
COPY --from=build /usr/local/bin/grive /bin/grive
18-
ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 /bin/dumb-init
19-
RUN chmod 777 /bin/dumb-init /bin/grive \
20-
&& mkdir /data \
21-
&& apk add yajl libcurl libgcrypt \
22-
boost-program_options boost-regex libstdc++ boost-system boost binutils \
15+
16+
RUN apk add yajl libcurl libgcrypt boost-program_options boost-regex libstdc++ boost-system \
2317
&& apk add boost-filesystem --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
2418

19+
COPY --from=build /usr/local/bin/grive /bin/grive
20+
RUN chmod 777 /bin/grive \
21+
&& mkdir /data
22+
2523
VOLUME /data
2624
WORKDIR /data
27-
ENTRYPOINT ["dumb-init", "grive"]
25+
ENTRYPOINT grive

0 commit comments

Comments
 (0)