dever 6 yıl önce
ebeveyn
işleme
e69d9363fe

+ 2 - 2
container/conf/web/nginx/conf.d/site.conf

@@ -40,8 +40,8 @@ server {
         # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
 
         # With php-cgi alone:
-        #fastcgi_pass web-php7:9000;
-        fastcgi_pass web-php5:9000;
+        fastcgi_pass web-php7:9000;
+        #fastcgi_pass web-php5:9000;
         # With php-fpm:
         #fastcgi_pass unix:/var/run/php7-fpm.sock;
         fastcgi_index index.php;

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

@@ -6,7 +6,10 @@ ENV DEMETER_HOME=/usr/local/convert
 ENV DEMETER_CONF=env
 ENV PATH=$PATH:$DEMETER_HOME
 
-RUN apk add --no-cache --update git curl nginx gcc g++ python-dev py-pip make cmake openssl-dev libffi-dev imagemagick imagemagick-dev && \
+
+RUN echo -e '@testing http://mirrors.ustc.edu.cn/alpine/edge/community' >> /etc/apk/repositories
+
+RUN apk add --no-cache --update git curl nginx gcc g++ python-dev py-pip make cmake openssl-dev libffi-dev imagemagick6 imagemagick6-dev && \
 	pip install --upgrade pip && \
 	pip install gevent==1.2 && \
 	pip install redis && \

+ 1 - 1
src/docker/build/office/libreoffice/Dockerfile

@@ -2,7 +2,7 @@ FROM docker.dever.cc/office/pdf2htmlex:latest
 
 MAINTAINER Rabin "https://github.com/shemic"
 
-RUN apk update && apk add --no-cache libreoffice font-adobe-100dpi git && \
+RUN apk update && apk add --no-cache libreoffice openjdk8 font-adobe-100dpi git && \
 	cd /usr/share/fonts && \
 	git clone http://git.dever.cc:3000/rabin/fonts.git win && \
 	cd win && \