Skip to content

Commit

Permalink
Upgrade Alpine to 3.7 and phpmd. phpcpd
Browse files Browse the repository at this point in the history
  • Loading branch information
andypost committed Apr 11, 2018
1 parent 28f7304 commit 52337cd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.6
FROM alpine:3.7

ARG BUILD_DATE
ARG VCS_REF
Expand All @@ -19,19 +19,22 @@ RUN set -e \
php7 \
php7-apcu \
php7-ctype \
php7-dom \
php7-json \
php7-mbstring \
php7-opcache \
php7-openssl \
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 \
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

0 comments on commit 52337cd

Please sign in to comment.