diff --git a/Dockerfile b/Dockerfile index 8abf067..f2121bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 ARG BUILD_DATE ARG VCS_REF @@ -19,6 +19,7 @@ RUN set -e \ php7 \ php7-apcu \ php7-ctype \ + php7-dom \ php7-json \ php7-mbstring \ php7-opcache \ @@ -26,12 +27,14 @@ RUN set -e \ php7-phar \ php7-simplexml \ php7-tokenizer \ + php7-xml \ php7-xmlwriter \ - php7-zlib \ && curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/bin \ - && composer global require drupal/coder --update-no-dev --no-suggest --prefer-dist ^8.2 \ + && composer global require drupal/coder ^8.2 phpmd/phpmd ^2 sebastian/phpcpd ^4 --update-no-dev --no-suggest --prefer-dist \ && ln -s /root/.composer/vendor/bin/phpcs /usr/bin/phpcs \ && ln -s /root/.composer/vendor/bin/phpcbf /usr/bin/phpcbf \ + && ln -s /root/.composer/vendor/bin/phpmd /usr/bin/. \ + && ln -s /root/.composer/vendor/bin/phpcpd /usr/bin/. \ && ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/Drupal /root/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Drupal \ && ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/DrupalPractice /root/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/DrupalPractice \ && cd /root/.composer/vendor/drupal/coder && curl https://www.drupal.org/files/issues/2857856-8.patch | patch -p1 && cd \ diff --git a/build.sh b/build.sh index 0ce0f15..8c50a2b 100755 --- a/build.sh +++ b/build.sh @@ -5,8 +5,8 @@ set -e -x docker build --pull \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \ - -t skilldlabs/docker-phpcs-drupal . + -t skilldlabs/docker-phpcs-drupal:next . cd ci -docker build -t skilldlabs/docker-phpcs-drupal:ci . +#docker build -t skilldlabs/docker-phpcs-drupal:ci .