From d9969190f093c3d29ce46031590ff7ada12c89e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petar=20Obradovi=C4=87?= Date: Fri, 29 Nov 2019 12:10:49 +0100 Subject: [PATCH 1/3] Make PHP 7.4 the default development target --- dev/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile index d388682f..4f7c3bc9 100644 --- a/dev/docker/Dockerfile +++ b/dev/docker/Dockerfile @@ -1,6 +1,6 @@ -ARG PHP_VERSION=7.3 +ARG PHP_VERSION=7.4 -FROM php:${PHP_VERSION}-cli-alpine3.8 +FROM php:${PHP_VERSION}-cli-alpine3.10 LABEL maintainer="Petar Obradović " # This is where we're going to store all of our non-project specific binaries From 467eb262d81e8623e4ecdb40e42facb40c110646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petar=20Obradovi=C4=87?= Date: Fri, 29 Nov 2019 12:11:39 +0100 Subject: [PATCH 2/3] Add ability to customize package versions --- dev/docker/Dockerfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile index 4f7c3bc9..92949552 100644 --- a/dev/docker/Dockerfile +++ b/dev/docker/Dockerfile @@ -3,6 +3,11 @@ ARG PHP_VERSION=7.4 FROM php:${PHP_VERSION}-cli-alpine3.10 LABEL maintainer="Petar Obradović " +ARG COMPOSER_VERSION=1.9.1 +ARG FLEX_VERSION=1.4.8 +ARG TIMECOP_VERSION=1.2.10 +ARG XDEBUG_VERSION=2.8.0 + # This is where we're going to store all of our non-project specific binaries RUN mkdir -p /app/bin ENV PATH /app/bin:$PATH @@ -17,8 +22,8 @@ RUN apk add --update --no-cache --virtual .build-deps \ xml \ zip \ && pecl install \ - xdebug-2.7.2 \ - timecop-beta \ + xdebug-${XDEBUG_VERSION} \ + timecop-${TIMECOP_VERSION} \ && docker-php-ext-enable \ xdebug \ timecop \ @@ -41,13 +46,13 @@ RUN apk add --update --no-cache \ RUN curl --show-error https://getcomposer.org/installer | php -- \ --install-dir=/app/bin \ --filename=composer \ - --version=1.9.1 + --version=${COMPOSER_VERSION} # Create the user that's going to run our application RUN useradd -ms /bin/sh app # Enable parallel package installation for Composer -RUN su-exec app composer global require symfony/flex +RUN su-exec app composer global require symfony/flex:${FLEX_VERSION} COPY entrypoint.sh /usr/local/bin/docker-entrypoint From 601626d0b991cf896a54234d554ff67d36038cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petar=20Obradovi=C4=87?= Date: Fri, 29 Nov 2019 12:12:23 +0100 Subject: [PATCH 3/3] Expand testing matrix in Travis CI --- .travis.yml | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c4cf298..4ca7e1ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,23 +9,27 @@ services: env: # PHP 7.2 - - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=3.4.* - - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.2.* - - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.3.* - - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=3.4.* - - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.2.* - - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.3.* + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=3.4.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.2.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.3.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.4.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=3.4.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.2.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.3.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.2 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.4.* XDEBUG_VERSION=2.7.2 # PHP 7.3 - - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=3.4.* - - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.2.* - - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.3.* - - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=3.4.* - - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.2.* - - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.3.* + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=3.4.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.2.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.3.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=nyholm SYMFONY_VERSION=4.4.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=3.4.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.2.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.3.* XDEBUG_VERSION=2.7.2 + - PHP_VERSION=7.3 PSR_HTTP_PROVIDER=zendframework SYMFONY_VERSION=4.4.* XDEBUG_VERSION=2.7.2 install: - - dev/bin/docker-compose build --build-arg PHP_VERSION=${PHP_VERSION} php + - dev/bin/docker-compose build --build-arg PHP_VERSION=${PHP_VERSION} --build-arg XDEBUG_VERSION=${XDEBUG_VERSION} php before_script: # Our docker image has symfony/flex installed to make sure SYMFONY_VERSION is working