Skip to content

Commit 969e0e5

Browse files
committed
Merge remote-tracking branch 'origin/master' into version_2.0.0
2 parents 043f6bf + 7c55401 commit 969e0e5

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

docker/pdfsandwich-1.4-centos-6.8/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
12
FROM centos:centos6.8
23
MAINTAINER keensoft
34

45
RUN set -x \
56
&& yum -y install wget gcc gcc-c++ make autoconf automake libtool libjpeg-devel libpng-devel libtiff-devel zlib-devel ocaml ImageMagick ImageMagick-devel
67

78
RUN set -x \
8-
&& wget http://www.leptonica.org/source/leptonica-1.74.4.tar.gz \
9-
&& tar xvf leptonica-1.74.4.tar.gz \
10-
&& cd leptonica-1.74.4 \
9+
&& wget http://www.leptonica.org/source/leptonica-1.74.4.tar.gz \
10+
&& tar xvf leptonica-1.74.4.tar.gz \
11+
&& cd leptonica-1.74.4 \
1112
&& ./configure \
1213
&& make \
1314
&& make install
+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
```
2+
$ docker build -t keensoft/pdfsandwich:1.4 .
3+
$ alias pdfsandwich='docker run --rm -v `pwd`:/work -w /work keensoft/pdfsandwich:1.4'
4+
$ pdfsandwich test.pdf
15
```
2-
$ docker build -t keensoft/pdfsandwich:1.4 .
3-
$ alias pdfsandwich='docker run --rm -v `pwd`:/work -w /work keensoft/pdfsandwich:1.4'
4-
$ pdfsandwich test.pdf
5-
```
6+
\ No newline at end of file
-222 KB
Binary file not shown.

docker/pdfsandwich-1.6-centos-7/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ RUN set -x \
55
&& yum -y install wget gcc gcc-c++ make autoconf automake libtool libjpeg-devel libpng-devel libtiff-devel zlib-devel ocaml ImageMagick ImageMagick-devel
66

77
RUN set -x \
8-
&& wget http://www.leptonica.com/source/leptonica-1.74.4.tar.gz \
9-
&& tar xvf leptonica-1.74.4.tar.gz \
10-
&& cd leptonica-1.74.4 \
8+
&& wget http://www.leptonica.com/source/leptonica-1.74.4.tar.gz \
9+
&& tar xvf leptonica-1.74.4.tar.gz \
10+
&& cd leptonica-1.74.4 \
1111
&& ./configure \
1212
&& make \
1313
&& make install

0 commit comments

Comments
 (0)