added switch for legacy gdlib

yiisoft · Dec 17, 2019 · 7e40aec · 7e40aec
1 parent 539499e
commit 7e40aec
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,35 +2,35 @@ language: bash
 services: docker
 
 env:
-  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=5.6-fpm-alpine
-  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.0-fpm-alpine
-  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.1-fpm-alpine
-  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.2-fpm-alpine
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-fpm
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-fpm
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.1-fpm
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.2-fpm
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.3-fpm
+  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=5.6-fpm-alpine X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.0-fpm-alpine X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.1-fpm-alpine X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.2-fpm-alpine X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-fpm X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-fpm X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.1-fpm X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.2-fpm X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.3-fpm X_LEGACY_GD_LIB=1
   - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.4-fpm
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-apache
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-apache
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.1-apache
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.2-apache
-  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.3-apache
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-apache X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-apache X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.1-apache X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.2-apache X_LEGACY_GD_LIB=1
+  - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.3-apache X_LEGACY_GD_LIB=1
   - DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.4-apache
 
 matrix:
   allow_failures:
     # Not supported PHP versions (Alpine 5.6-7.1 have a broken ImageMagick installation, 7.2 does not pass all framework tests)
-    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=5.6-fpm-alpine
-    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.0-fpm-alpine
-    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.1-fpm-alpine
-    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.2-fpm-alpine
+    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=5.6-fpm-alpine X_LEGACY_GD_LIB=1
+    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.0-fpm-alpine X_LEGACY_GD_LIB=1
+    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.1-fpm-alpine X_LEGACY_GD_LIB=1
+    - env: DOCKERFILE_FLAVOUR=alpine PHP_BASE_IMAGE_VERSION=7.2-fpm-alpine X_LEGACY_GD_LIB=1
     # Deprecated PHP versions
-    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-fpm
-    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-fpm
-    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-apache
-    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-apache
+    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-fpm X_LEGACY_GD_LIB=1
+    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-fpm X_LEGACY_GD_LIB=1
+    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=5.6-apache X_LEGACY_GD_LIB=1
+    - env: DOCKERFILE_FLAVOUR=debian PHP_BASE_IMAGE_VERSION=7.0-apache X_LEGACY_GD_LIB=1
 
 before_install:
   - export TEST_YII_VERSION=6b0be47e0fa9c532e03b07b4369050582fcf5c7a

diff --git a/docker-compose.apache.yml b/docker-compose.apache.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.2'
 services:
 
   php:

diff --git a/docker-compose.fpm-nginx.yml b/docker-compose.fpm-nginx.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.2'
 services:
   web:
     image: phundament/nginx-one:1.9-5.1.1
@@ -8,4 +8,4 @@ services:
       - '8100:80'
     volumes:
       # Application testing
-      - ./_host-volumes/app/web:/app/web:delegated
+      - ./_host-volumes/app/web:/app/web:delegated
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.2'
 services:
 
   php:

diff --git a/php/Dockerfile-debian b/php/Dockerfile-debian
@@ -39,10 +39,17 @@ RUN apt-get update && \
         rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install PHP extensions required for Yii 2.0 Framework
-RUN docker-php-ext-configure gd \
-        --with-freetype-dir=/usr/include/ \
-        --with-png-dir=/usr/include/ \
-        --with-jpeg-dir=/usr/include/ && \
+ARG X_LEGACY_GD_LIB=0
+RUN if [ $X_LEGACY_GD_LIB = 1 ]; then \
+        docker-php-ext-configure gd \
+                --with-freetype-dir=/usr/include/ \
+                --with-png-dir=/usr/include/ \
+                --with-jpeg-dir=/usr/include/; \
+    else \
+        docker-php-ext-configure gd \
+                --with-freetype=/usr/include/ \
+                --with-jpeg=/usr/include/; \
+    fi && \
     docker-php-ext-configure bcmath && \
     docker-php-ext-install \
         soap \