rabin 7 vuotta sitten
vanhempi
commit
94774ca403

+ 4 - 4
src/docker/build/office/convert/Dockerfile

@@ -6,16 +6,16 @@ ENV DEMETER_HOME=/usr/local/convert
 ENV DEMETER_CONF=env
 ENV PATH=$PATH:$DEMETER_HOME
 
-RUN apk add --no-cache --update gcc curl gcc g++ python-dev && \
+RUN apk add --no-cache --update gcc curl gcc g++ python-dev py-pip && \
 	pip install --upgrade pip && \
 	pip install redis && \
 	pip install -U git+http://git.dever.cc:3000/python/demeter.git && \
 	git clone http://git.dever.cc:3000/python/convert.git $DEMETER_HOME && \
-	chmod -R +x $DEMETER_HOME/*.py && \
+	#chmod -R +x $DEMETER_HOME/*.py && \
 	apk del curl gcc g++ python-dev
 
 EXPOSE 8087 8088
 
-COPY convert.sh /entrypoint/convert.sh
+#COPY convert.sh /entrypoint/convert.sh
 
-CMD ["convert"]
+#CMD ["convert"]

+ 23 - 2
src/docker/build/office/pdf2htmlex/Dockerfile

@@ -1,3 +1,24 @@
-FROM bwits/pdf2htmlex-alpine
+FROM docker.dever.cc/dev/python:latest
 
-MAINTAINER Rabin "https://github.com/shemic"
+MAINTAINER Rabin "https://github.com/shemic"
+
+ENV REFRESHED_AT 20151105
+
+RUN apk --update add alpine-sdk xz poppler-dev pango-dev m4 libtool perl autoconf automake coreutils python-dev zlib-dev freetype-dev glib-dev cmake && \
+    cd / && \
+    git clone https://github.com/BWITS/fontforge.git && \
+    cd fontforge && \
+    ./bootstrap --force && \
+    ./configure --without-iconv && \
+    make && \
+    make install && \
+    cd / && \
+    git clone git://github.com/coolwanglu/pdf2htmlEX.git && \
+    cd pdf2htmlEX && \
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig && \
+    cmake . && make && sudo make install && \
+    apk del alpine-sdk xz poppler-dev pango-dev m4 libtool perl autoconf automake coreutils python-dev zlib-dev freetype-dev glib-dev cmake && \
+    apk add libpng python freetype glib libintl libxml2 libltdl cairo poppler pango && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm /var/cache/apk/* && \
+    rm -rf /fontforge /libspiro /libuninameslist /pdf2htmlEX

+ 6 - 1
src/docker/conf/office.conf

@@ -3,4 +3,9 @@ path = {base}
 network = office
 
 [convert]
-port = 9907:9907
+port = 9907:9907
+command = sh
+
+[redis]
+port = 6379:6379
+volumes = {container}conf/db/redis/redis.conf:/etc/redis.conf