瀏覽代碼

Fix libgmp not locating gmp.h file

desaroger 7 年之前
父節點
當前提交
198c3906b2
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 2
      php-fpm/Dockerfile-56
  2. 1 2
      travis-build.sh

+ 3 - 2
php-fpm/Dockerfile-56

@@ -177,7 +177,8 @@ ARG INSTALL_GMP=false
 RUN if [ ${INSTALL_GMP} = true ]; then \
     # Install the GMP extension
 	apt-get update -yqq && \
-	apt-get install -y libgmp3-dev && \
+	apt-get install -y libgmp-dev && \
+	ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h && \
     docker-php-ext-install gmp \
 ;fi
 
@@ -324,7 +325,7 @@ ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
     apt-get update -y && \
-    apt-get install -y libmagickwand-dev imagemagick && \ 
+    apt-get install -y libmagickwand-dev imagemagick && \
     pecl install imagick && \
     docker-php-ext-enable imagick \
 ;fi

+ 1 - 2
travis-build.sh

@@ -13,8 +13,7 @@ env | sort
 if [ -n "${PHP_VERSION}" ]; then
     cp env-example .env
     sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env
-    sed -i -- 's/=false/=false/g' .env
-    sed -i -- 's/=true/=false/g' .env
+    sed -i -- 's/=false/=true/g' .env
     cat .env
     docker-compose build ${BUILD_SERVICE}
     docker images