diff --git a/docker-compose.yml b/docker-compose.yml index 6224f02..8c2c204 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,29 +5,27 @@ services: # Required to run project # php: - image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php + image: meritoo/php7 container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-php entrypoint: php command: -S 0.0.0.0:9999 - build: - context: ./docker/config - args: - - TIMEZONE=${TIMEZONE} + environment: + TIMEZONE: ${TIMEZONE} volumes: - - .:/project:cached + - .:/var/www/application:cached composer: - image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php + image: meritoo/php7 container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-composer entrypoint: php -d memory_limit=-1 /usr/local/bin/composer volumes: - - .:/project:cached + - .:/var/www/application:cached # # Required to run PHPUnit's tests # phpunit: - image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php + image: meritoo/php7 container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-phpunit entrypoint: ./vendor/bin/phpunit command: --version volumes: - - .:/project:cached + - .:/var/www/application:cached diff --git a/docker/config/Dockerfile b/docker/config/Dockerfile deleted file mode 100644 index 5a7861b..0000000 --- a/docker/config/Dockerfile +++ /dev/null @@ -1,131 +0,0 @@ -FROM php:7.2-cli -MAINTAINER Meritoo - -# -# Tools & libraries -# -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - vim \ - git \ - unzip \ - libicu-dev \ - locales \ - && apt-get clean \ - && rm -rf \ - /var/lib/apt/lists/* \ - /tmp/* \ - /var/tmp/* - -# -# Generating locales: -# - de_DE -# - es_ES -# - en_GB -# - en_US -# - fr_FR -# - it_IT -# - pl_PL -# - ru_RU -# -RUN sed -i 's/^# de_DE/de_DE/g; \ - s/^# es_ES/es_ES/g; \ - s/^# en_GB/en_GB/g; \ - s/^# en_US/en_US/g; \ - s/^# fr_FR/fr_FR/g; \ - s/^# it_IT/it_IT/g; \ - s/^# pl_PL/pl_PL/g; \ - s/^# ru_RU/ru_RU/g;' /etc/locale.gen \ - && locale-gen - -# -# Set default language -# -# Required to avoid problem with using strange language by error messages. -# Example: "chmod(): Aucun fichier ou dossier de ce type" -# -ENV LANGUAGE=en_US.UTF-8 - -# -# PHP extensions -# -RUN docker-php-ext-install \ - intl \ - mbstring - -# -# PHP extensions (PECL): -# - Xdebug -# -RUN pecl install \ - xdebug \ - && docker-php-ext-enable \ - xdebug - -COPY xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini - -# -# PHP configuration: -# - default configuration -# - timezone -# -COPY php.ini /usr/local/etc/php/php.ini -ARG TIMEZONE -RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \ - && echo ${TIMEZONE} > /etc/timezone \ - && printf '[PHP]\ndate.timezone = "%s"\n' ${TIMEZONE} > /usr/local/etc/php/conf.d/tzone.ini \ - && "date" -#RUN echo "\n""date.timezone = $TIMEZONE""\n" >> /usr/local/etc/php/php.ini - -# -# Phing -# -RUN pear channel-discover pear.phing.info \ - && pear install [--alldeps] phing/phing - -# -# Composer - environment variables: -# - disable warning about running commands as root/super user -# - disable automatic clearing of sudo sessions -# -# More: -# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser -# -ENV COMPOSER_ALLOW_SUPERUSER 1 - -# -# Composer + https://packagist.org/packages/hirak/prestissimo package -# -RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php -r "if (hash_file('SHA384', 'composer-setup.php') === \ - '48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9a62d6444cdb0dcd0615698a5cbe587c3f0fe57a54d8f5') { echo \ - 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \ - && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \ - && php -r "unlink('composer-setup.php');" \ - && composer global require \ - --no-plugins \ - --no-scripts \ - --no-progress \ - --no-suggest \ - --no-interaction \ - --prefer-dist \ - --optimize-autoloader \ - --classmap-authoritative \ - hirak/prestissimo \ - && rm -rf ~/.composer/cache/* \ - && composer clear-cache \ - && composer --version - -# -# Bash -# -RUN sed -i 's/^# export/export/g; \ - s/^# alias/alias/g;' ~/.bashrc \ - && echo 'COLUMNS=200'"\n" >> ~/.bashrc - -# -# Use project-related binaries globally -# -ENV PATH="/project/vendor/bin:${PATH}" - -WORKDIR /project diff --git a/docker/config/php.ini b/docker/config/php.ini deleted file mode 100644 index b984c5d..0000000 --- a/docker/config/php.ini +++ /dev/null @@ -1,3 +0,0 @@ -display_errors = On -display_startup_errors = On -error_reporting = E_ALL diff --git a/docker/config/xdebug.ini b/docker/config/xdebug.ini deleted file mode 100644 index 22b2547..0000000 --- a/docker/config/xdebug.ini +++ /dev/null @@ -1,6 +0,0 @@ -[xdebug] -zend_extension=xdebug.so - -xdebug.remote_enable=1 -xdebug.remote_port=9001 -xdebug.remote_host=10.254.254.254 diff --git a/phing/filesets.xml b/phing/filesets.xml index fa969ea..59355ff 100644 --- a/phing/filesets.xml +++ b/phing/filesets.xml @@ -4,9 +4,7 @@ diff --git a/phing/properties.dist b/phing/properties.dist index 74bdba4..941410c 100644 --- a/phing/properties.dist +++ b/phing/properties.dist @@ -53,12 +53,6 @@ dir.reports.coverage = ${dir.reports}/phpunit-coverage dir.data.tests = ${dir.data}/tests dir.data.temporary = ${dir.data}/tmp -# Docker directories -# -dir.docker = ${project.basedir}/docker -dir.docker.data = ${dir.docker}/data/db -dir.docker.logs = ${dir.docker}/logs/nginx - # -------------------------------------------------------------------------------- # Static Analysis # --------------------------------------------------------------------------------