Skip to content

Commit c5013d0

Browse files
committed
Use alpine 3.5 & build args
1 parent e1b06e0 commit c5013d0

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

Dockerfile

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

3-
MAINTAINER Andriy Yun <[email protected]>
4-
MAINTAINER Andy Postnikov <[email protected]>
3+
ARG BUILD_DATE
4+
ARG VCS_REF
5+
6+
LABEL org.label-schema.build-date=$BUILD_DATE \
7+
org.label-schema.vcs-ref=$VCS_REF \
8+
org.label-schema.schema-version="1.0" \
9+
org.label-schema.name="docker-phpcs-drupal" \
10+
org.label-schema.description="PHP codesniffer for Drupal - phpcs & phpcbf" \
11+
org.label-schema.vcs-url="https://github.com/skilld-labs/docker-phpcs-drupal" \
12+
maintainer="Andriy Yun <[email protected]>, Andy Postnikov <[email protected]>"
513

614
RUN apk add --no-cache \
715
php7 \
@@ -15,7 +23,6 @@ RUN apk add --no-cache \
1523
php7-xml \
1624
php7-zlib \
1725
curl \
18-
patch \
1926
git \
2027
&& ln -s /usr/bin/php7 /usr/bin/php \
2128
&& curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=/usr/bin \

build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh
2+
3+
docker build \
4+
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
5+
--build-arg VCS_REF=`git rev-parse --short HEAD` \
6+
-t skilldlabs/docker-phpcs-drupal .
7+
8+
cd ci
9+
10+
docker build -t skilldlabs/docker-phpcs-drupal:ci .

ci/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
FROM skilldlabs/docker-phpcs-drupal:latest
22

3-
MAINTAINER Andriy Yun <[email protected]>
4-
MAINTAINER Andy Postnikov <[email protected]>
5-
63
RUN apk add --no-cache git \
74
&& curl -o /usr/bin/gitlab-ci-multi-runner https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/binaries/gitlab-ci-multi-runner-linux-amd64 \
85
&& chmod +x /usr/bin/gitlab-ci-multi-runner \

0 commit comments

Comments
 (0)