dever 6 years ago
parent
commit
18ce29b0f9

+ 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;

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

@@ -6,7 +6,7 @@ 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 && \
+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 libxml2-dev && \
     cd / && \
     git clone https://github.com/BWITS/fontforge.git && \
     cd fontforge && \

+ 5 - 1
src/shell/git/pull

@@ -1,4 +1,8 @@
 #!/usr/bin/env sh
 set -e
 cd $1
-git pull
+git config --global user.email "dm@dever.cc"
+git config --global user.name "dever"
+git stash
+git pull
+git stash pop