Skip to content

Commit 6817ed8

Browse files
committed
Upgrade Alpine to 3.10, add phpmd and phpcpd
1 parent eb51fe8 commit 6817ed8

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

Dockerfile

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.6
1+
FROM alpine:3.10
22

33
ARG BUILD_DATE
44
ARG VCS_REF
@@ -19,28 +19,31 @@ RUN set -e \
1919
php7 \
2020
php7-apcu \
2121
php7-ctype \
22+
php7-dom \
2223
php7-json \
2324
php7-mbstring \
2425
php7-opcache \
2526
php7-openssl \
2627
php7-phar \
2728
php7-simplexml \
2829
php7-tokenizer \
30+
php7-xml \
2931
php7-xmlwriter \
30-
php7-zlib \
3132
&& curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/bin \
32-
&& composer global require drupal/coder --update-no-dev --no-suggest --prefer-dist ^8.2 \
33+
&& composer global require drupal/coder ^8.3.2 phpmd/phpmd ^2 sebastian/phpcpd ^4 --update-no-dev --no-suggest --prefer-dist \
3334
&& ln -s /root/.composer/vendor/bin/phpcs /usr/bin/phpcs \
3435
&& ln -s /root/.composer/vendor/bin/phpcbf /usr/bin/phpcbf \
35-
&& ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/Drupal /root/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Drupal \
36-
&& ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/DrupalPractice /root/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/DrupalPractice \
36+
&& ln -s /root/.composer/vendor/bin/phpmd /usr/bin/phpmd \
37+
&& ln -s /root/.composer/vendor/bin/phpcpd /usr/bin/phpcpd \
38+
&& ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/Drupal /root/.composer/vendor/squizlabs/php_codesniffer/src/Standards/Drupal \
39+
&& ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/DrupalPractice /root/.composer/vendor/squizlabs/php_codesniffer/src/Standards/DrupalPractice \
3740
&& cd /root/.composer/vendor/drupal/coder && curl https://www.drupal.org/files/issues/2857856-8.patch | patch -p1 && cd \
38-
&& git clone --branch master https://git.drupal.org/sandbox/coltrane/1921926.git /root/drupalsecure_code_sniffs \
41+
&& git clone --branch master https://git.drupalcode.org/sandbox/coltrane-1921926.git /root/drupalsecure_code_sniffs \
3942
&& rm -rf /root/drupalsecure_code_sniffs/.git \
4043
&& cd /root/drupalsecure_code_sniffs && curl https://www.drupal.org/files/issues/parenthesis_closer_notice-2320623-2.patch | git apply && cd \
4144
&& apk del --no-cache git \
4245
&& rm -rf /root/.composer/cache/* \
43-
&& ln -s /root/drupalsecure_code_sniffs/DrupalSecure /root/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/DrupalSecure \
46+
&& ln -s /root/drupalsecure_code_sniffs/DrupalSecure /root/.composer/vendor/squizlabs/php_codesniffer/src/Standards/DrupalSecure \
4447
&& sed -i "s/.*memory_limit = .*/memory_limit = -1/" /etc/php7/php.ini
4548

4649
VOLUME /work

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e -x
55
docker build --pull \
66
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
77
--build-arg VCS_REF=`git rev-parse --short HEAD` \
8-
-t skilldlabs/docker-phpcs-drupal .
8+
-t skilldlabs/docker-phpcs-drupal:next .
99

1010
docker build --pull \
1111
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \

0 commit comments

Comments
 (0)