Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ before_install:
- chmod +x /usr/local/bin/docker-compose

- docker --version
- docker build -q -t vfac/envdevphpbase:7.3-fpm .
- docker run --name php7.3 -d -v $PWD:/var/www/html vfac/envdevphpbase:7.3-fpm
- docker-compose -f test/7.3/docker-compose.yml up -d
- docker build -q -t vfac/envdevphpbase:7.4-fpm .
- docker run --name php7.4 -d -v $PWD:/var/www/html vfac/envdevphpbase:7.4-fpm
- docker-compose -f test/7.4/docker-compose.yml up -d

script:
- docker exec php7.3 php -v
- docker exec php7.3 sh -c "php -v | grep 7.3"
- docker exec php7.3 sh -c "php test/test.php |grep version"
- docker exec php7.3 composer --version
- docker exec php7.4 php -v
- docker exec php7.4 sh -c "php -v | grep 7.4"
- docker exec php7.4 sh -c "php test/test.php |grep version"
- docker exec php7.4 composer --version
- curl -s localhost:8072/test.php |grep bcmath
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2019-12-31]

## Added

- Add PHP 7.4 FPM branch
- Add PHP 7.4 CLI branch
- Add PHP 7.4 FPM ALpine branch

## [2019-09-22]

## Added
Expand Down
20 changes: 11 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.3-fpm
FROM php:7.4-fpm
LABEL maintainer="Vincent Faliès <vincent@vfac.fr>"

RUN apt-get update && apt-get install -y \
Expand Down Expand Up @@ -42,19 +42,21 @@ RUN apt-get update && apt-get install -y \
librabbitmq-dev \
inetutils-ping \
libaio1 \
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
libonig-dev \
libpq-dev
RUN PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install -j$(nproc) imap \
&& docker-php-ext-configure intl \
&& docker-php-ext-install -j$(nproc) intl \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) gd \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& docker-php-ext-install ldap \
&& docker-php-ext-install -j$(nproc) bcmath bz2 calendar ctype curl dba dom enchant exif fileinfo ftp gettext gmp hash iconv \
mbstring sodium mysqli opcache pcntl pdo pdo_mysql pdo_sqlite phar posix pspell readline recode \
session shmop simplexml snmp soap sockets sysvmsg sysvsem sysvshm tidy tokenizer wddx xml xmlrpc \
xmlwriter xsl zip \
&& apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y \
&& docker-php-ext-install ldap
RUN docker-php-ext-install -j$(nproc) bcmath bz2 calendar ctype curl dba dom enchant exif ffi fileinfo filter ftp gd gettext gmp iconv intl json ldap \
mbstring mysqli opcache pcntl pdo pdo_mysql pdo_pgsql pdo_sqlite pgsql phar posix pspell readline session shmop simplexml snmp soap sockets sodium \
sysvmsg sysvsem sysvshm tidy tokenizer xml xmlrpc xmlwriter xsl zend_test zip

RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/*

# set up sendmail config
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017-2018 Vincent Faliès
Copyright (c) 2017-2020 Vincent Faliès

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ The utlisation outside this project is naturally possible.

## Images

Seven PHP versions are available through image's tags:
Nine PHP versions are available through image's tags:

- 5.6 FPM
- 7.0 FPM
- 7.1 FPM
- 7.2 FPM
- 7.3 FPM
- 7.4 FPM
- 7.0 CLI
- 7.1 CLI
- 7.2 CLI
- 7.3 CLI
- 7.4 CLI

The latest version of EnvDevPHPBase (latest) (`vfac/envdevphpbase`) is a image with the last version of PHP FPM available.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- "$PWD/test:/var/www/html"

fpm:
image: vfac/envdevphpbase:7.2
image: vfac/envdevphpbase:7.4
expose:
- 9000
volumes:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.