Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit c13e50a

Browse files
committed
Update to Php 7.1 & cleanup
1 parent 7c404b3 commit c13e50a

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

‎Dockerfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.6
22

33
ARG BUILD_DATE
44
ARG VCS_REF
@@ -11,7 +11,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
1111
org.label-schema.vcs-url="https://github.com/skilld-labs/docker-phpcs-drupal" \
1212
maintainer="Andriy Yun <andriy.yun@gmail.com>, Andy Postnikov <apostnikov@gmail.com>"
1313

14-
RUN apk add --no-cache \
14+
RUN set -e \
15+
&& apk add --no-cache \
1516
curl \
1617
git \
1718
patch \
@@ -23,17 +24,19 @@ RUN apk add --no-cache \
2324
php7-opcache \
2425
php7-openssl \
2526
php7-phar \
26-
php7-xml \
27+
php7-simplexml \
28+
php7-tokenizer \
29+
php7-xmlwriter \
2730
php7-zlib \
28-
&& ln -s /usr/bin/php7 /usr/bin/php \
2931
&& curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/bin \
30-
&& composer global require drupal/coder \
31-
&& ln -s /root/.composer/vendor/squizlabs/php_codesniffer/scripts/phpcs /usr/bin/phpcs \
32-
&& ln -s /root/.composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf /usr/bin/phpcbf \
32+
&& composer global require drupal/coder --update-no-dev --no-suggest --prefer-dist ^8.2 \
33+
&& ln -s /root/.composer/vendor/bin/phpcs /usr/bin/phpcs \
34+
&& ln -s /root/.composer/vendor/bin/phpcbf /usr/bin/phpcbf \
3335
&& ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/Drupal /root/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Drupal \
3436
&& ln -s /root/.composer/vendor/drupal/coder/coder_sniffer/DrupalPractice /root/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/DrupalPractice \
3537
&& cd /root/.composer/vendor/drupal/coder && curl https://www.drupal.org/files/issues/2857856-8.patch | patch -p1 && cd \
3638
&& git clone --branch master https://git.drupal.org/sandbox/coltrane/1921926.git /root/drupalsecure_code_sniffs \
39+
&& rm -rf /root/drupalsecure_code_sniffs/.git \
3740
&& cd /root/drupalsecure_code_sniffs && curl https://www.drupal.org/files/issues/parenthesis_closer_notice-2320623-2.patch | git apply && cd \
3841
&& apk del --no-cache git \
3942
&& rm -rf /root/.composer/cache/* \
@@ -43,4 +46,4 @@ RUN apk add --no-cache \
4346
VOLUME /work
4447
WORKDIR /work
4548

46-
CMD ["phpcs", "--standard=Drupal", "."]
49+
CMD ["phpcs", "--standard=Drupal,DrupalPractice", "."]

‎build.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22

3-
docker build \
3+
set -e -x
4+
5+
docker build --pull \
46
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
57
--build-arg VCS_REF=`git rev-parse --short HEAD` \
68
-t skilldlabs/docker-phpcs-drupal .

‎php.ini‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /