removed Alpine (failing) builds, improved ENV var readability on Travis

yiisoft · Dec 17, 2019 · 59656d7 · 59656d7
1 parent dc57724
commit 59656d7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 183 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,35 +2,26 @@ language: bash
 services: docker
 
 env:
-  - 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 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
+  - PHP_BASE_IMAGE_VERSION=5.6-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.1-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.2-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.3-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.4-fpm DOCKERFILE_FLAVOUR=debian
+  - PHP_BASE_IMAGE_VERSION=5.6-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.1-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.2-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - PHP_BASE_IMAGE_VERSION=7.3-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+  - 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 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 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
+    - env: PHP_BASE_IMAGE_VERSION=5.6-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+    - env: PHP_BASE_IMAGE_VERSION=7.0-fpm DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+    - env: PHP_BASE_IMAGE_VERSION=5.6-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
+    - env: PHP_BASE_IMAGE_VERSION=7.0-apache DOCKERFILE_FLAVOUR=debian X_LEGACY_GD_LIB=1
 
 before_install:
   - export TEST_YII_VERSION=83055dcc3347f0f9a30afa448339141f2f9ec7f7

diff --git a/docs/install-extensions.md b/docs/install-extensions.md
@@ -8,19 +8,6 @@
 
 ### mcrypt
 
-#### Alpine
-
-```
-RUN apk --update --virtual build-deps add \
-        libmcrypt-dev && \
-    apk add \
-        libmcrypt && \
-    docker-php-ext-install \
-        mcrypt && \
-    apk del \
-        build-deps            
-```
-
 #### Debian
 
 ```
@@ -46,24 +33,6 @@ RUN apt-get update && \
 
 ### memcache
 
-#### Alpine (PHP 7)
-
-    # memcache
-    ENV MEMCACHED_DEPS zlib-dev libmemcached-dev cyrus-sasl-dev git
-    RUN set -xe \
-     && apk add libmemcached \
-     && apk add --no-cache \
-         --virtual .memcached-deps \
-         $MEMCACHED_DEPS \
-     && curl https://codeload.github.com/php-memcached-dev/php-memcached/zip/php7 -o /tmp/memcached.zip \
-     && mkdir -p /usr/src/php/ext \
-     && unzip /tmp/memcached.zip -d /usr/src/php/ext \
-     && docker-php-ext-configure /usr/src/php/ext/php-memcached-php7 \
-         --disable-memcached-sasl \
-     && docker-php-ext-install /usr/src/php/ext/php-memcached-php7 \
-     && rm -rf /usr/src/php/ext/php-memcached-php7 /tmp/memcached.zip \
-     && apk del .memcached-deps
-
 #### Debian (PHP 7)     
      
     # memcache
@@ -80,40 +49,11 @@ RUN apt-get update && \
      && rm -rf /usr/src/php/ext/php-memcached-php7 /tmp/memcached.zip
      
 ### Xdebug
-
-#### Alpine
-
-    # Install xdebug
-    RUN export CFLAGS="$PHP_CFLAGS" CPPFLAGS="$PHP_CPPFLAGS" LDFLAGS="$PHP_LDFLAGS" && \
-        apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS && \
-        cd /tmp && \
-        git clone git://github.com/xdebug/xdebug.git && \
-        cd xdebug && \
-        git checkout 52adff7539109db592d07d3f6c325f6ee2a7669f && \
-        phpize && \
-        ./configure --enable-xdebug && \
-        make && \
-        make install && \
-        rm -rf /tmp/xdebug && \
-        apk del .phpize-deps
-        
-#### Debian
-
-    # Install xdebug
-    RUN cd /tmp && \
-        git clone git://github.com/xdebug/xdebug.git && \
-        cd xdebug && \
-        git checkout 52adff7539109db592d07d3f6c325f6ee2a7669f && \
-        phpize && \
-        ./configure --enable-xdebug && \
-        make && \
-        make install && \
-        rm -rf /tmp/xdebug        
+
         
 ### oci8 / pdo_oci
 You need to download the oracle instant client for your distro here: https://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
-#### Alpine
-*TBD*
+
 #### Debian
 Put the basic, devel and odbc rpm packages in a folder (oracle_instant_client in this example)
 

diff --git a/php/Dockerfile-alpine b/php/Dockerfile-alpine