Skip to content

Commit

Permalink
Merge pull request #126 from trikoder/expand-ci-matrix
Browse files Browse the repository at this point in the history
Expand CI matrix
  • Loading branch information
HypeMC authored Nov 29, 2019
2 parents 32908c1 + 601626d commit 8a44fd4
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 19 deletions.
30 changes: 17 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 11 additions & 6 deletions dev/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
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ć <[email protected]>"

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
Expand All @@ -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 \
Expand All @@ -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

Expand Down

0 comments on commit 8a44fd4

Please sign in to comment.