Merge pull request #4 from skilld-labs/update

Update to Php 7.1 & cleanup

Author: andriyun

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -11,7 +11,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
   org.label-schema.vcs-url="https://github.com/skilld-labs/docker-phpcs-drupal" \
   maintainer="Andriy Yun <andriy.yun@gmail.com>, Andy Postnikov <apostnikov@gmail.com>"
 
-RUN apk add --no-cache \
+RUN set -e \
+  && apk add --no-cache \
   curl \
   git \
   patch \
@@ -23,17 +24,19 @@ RUN apk add --no-cache \
   php7-opcache \
   php7-openssl \
   php7-phar \
-  php7-xml \
+  php7-simplexml \
+  php7-tokenizer \
+  php7-xmlwriter \
   php7-zlib \
-  && ln -s /usr/bin/php7 /usr/bin/php \
   && curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/bin \
-  && composer global require drupal/coder \
-  && ln -s /root/.composer/vendor/squizlabs/php_codesniffer/scripts/phpcs /usr/bin/phpcs \
-  && ln -s /root/.composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf /usr/bin/phpcbf \
+  && composer global require drupal/coder --update-no-dev --no-suggest --prefer-dist ^8.2 \
+  && 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/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 \
   && git clone --branch master https://git.drupal.org/sandbox/coltrane/1921926.git /root/drupalsecure_code_sniffs \
+  && rm -rf /root/drupalsecure_code_sniffs/.git \
   && cd /root/drupalsecure_code_sniffs && curl https://www.drupal.org/files/issues/parenthesis_closer_notice-2320623-2.patch | git apply && cd \
   && apk del --no-cache git \
   && rm -rf /root/.composer/cache/* \
@@ -43,4 +46,4 @@ RUN apk add --no-cache \
 VOLUME /work
 WORKDIR /work
 
-CMD ["phpcs", "--standard=Drupal", "."]
+CMD ["phpcs", "--standard=Drupal,DrupalPractice", "."]

build.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-docker build \
+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 .