diff --git a/.drone.yml b/.drone.yml index 10c30ce..9cc96c5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,6 +20,25 @@ steps: - master depends_on: [ clone ] +- name: php7.4-dev + image: plugins/docker + pull: if-not-exists + settings: + username: + from_secret: hub_username + password: + from_secret: hub_password + repo: + from_secret: hub_repo + build_args: + - PHP_VERSION=7.4-fpm-alpine3.13 + - ENVIRONMENT=development + tags: 7.4-alpine-dev + when: + branch: + - master + depends_on: [ clone ] + - name: php7.3 image: plugins/docker pull: if-not-exists @@ -68,7 +87,7 @@ steps: from_secret: hub_repo build_args: - PHP_VERSION=7.3-fpm-alpine3.12 - - ENVIRONMENT=dev + - ENVIRONMENT=development tags: 7.3-alpine-dev when: branch: diff --git a/Dockerfile b/Dockerfile index c484a9d..5cc4677 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,10 +102,6 @@ RUN /usr/local/bin/php_helper.sh RUN wget -O /bin/cachetool http://gordalina.github.io/cachetool/downloads/cachetool.phar RUN chmod a+x /bin/cachetool -#install phpunit -RUN wget -O phpunit https://phar.phpunit.de/phpunit-9.phar -RUN install phpunit /usr/local/bin - # Create directories RUN mkdir -p /var/www diff --git a/docker/usr/local/bin/php_helper.sh b/docker/usr/local/bin/php_helper.sh index 3c4f51c..5c6a4de 100755 --- a/docker/usr/local/bin/php_helper.sh +++ b/docker/usr/local/bin/php_helper.sh @@ -22,9 +22,14 @@ if [ $PHP_VERSION = '72' ]; then composer global require hirak/prestissimo fi +if [ $ENVIRONMENT != 'production' ]; then + wget -O phpunit https://phar.phpunit.de/phpunit-9.phar + install phpunit /usr/local/bin +fi + if [ $ENVIRONMENT = 'development' ]; then apk --update --no-cache add autoconf g++ make pecl install -f xdebug docker-php-ext-enable xdebug apk del --purge autoconf g++ make -fi \ No newline at end of file +fi