Skip to content

Commit ccc146d

Browse files
pointlessonegdiggs
authored andcommitted
Bump up dependencies (#32)
* Bump up PHP packages * Bump up PHP
1 parent d419bbb commit ccc146d

File tree

3 files changed

+375
-182
lines changed

3 files changed

+375
-182
lines changed

Dockerfile

+34-16
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,47 @@
1-
FROM alpine:3.3
1+
FROM alpine:edge
22

33
MAINTAINER Code Climate <[email protected]>
44

55
WORKDIR /usr/src/app
6-
COPY composer.json /usr/src/app/
7-
COPY composer.lock /usr/src/app/
8-
9-
RUN apk --update add git php-common php-xml php-dom php-ctype php-iconv \
10-
php-json php-pcntl php-phar php-openssl php-opcache php-sockets curl \
11-
build-base ruby-dev ruby ruby-bundler && \
12-
gem install httparty --no-rdoc --no-ri && \
13-
gem install json --no-rdoc --no-ri && \
14-
curl -sS https://getcomposer.org/installer | php && \
15-
/usr/src/app/composer.phar install && \
16-
apk del build-base
17-
186
COPY . /usr/src/app
197

8+
# Install PHP
9+
RUN apk --update add \
10+
php7-common \
11+
php7-ctype \
12+
php7-dom \
13+
php7-iconv \
14+
php7-json \
15+
php7-mbstring \
16+
php7-opcache \
17+
php7-openssl \
18+
php7-pcntl \
19+
php7-phar \
20+
php7-sockets \
21+
php7-xml && \
22+
rm /var/cache/apk/* && \
23+
ln -s /usr/bin/php7 /usr/bin/php
24+
25+
RUN apk --update add curl && \
26+
curl -sS https://getcomposer.org/installer | php && \
27+
./composer.phar install && \
28+
apk del curl && \
29+
rm /usr/src/app/composer.phar \
30+
/var/cache/apk/*
31+
32+
# Build Content
33+
RUN apk --update add build-base ca-certificates ruby ruby-dev && \
34+
gem install json httparty --no-rdoc --no-ri && \
35+
./bin/build-content && \
36+
rm -rf $( gem environment gemdir ) && \
37+
apk del build-base ca-certificates ruby ruby-dev && \
38+
rm /var/cache/apk/*
39+
2040
RUN adduser -u 9000 -D app
21-
RUN chown -R app .
41+
RUN chown -R app:app .
2242

2343
USER app
2444

25-
RUN ./bin/build-content
26-
2745
WORKDIR /code
2846
VOLUME /code
2947

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"require": {
3-
"phpmd/phpmd": "2.3.2",
4-
"barracudanetworks/forkdaemon-php": "1.0.*"
3+
"phpmd/phpmd": "~2.3",
4+
"barracudanetworks/forkdaemon-php": "~1.0.7"
55
},
66
"require-dev": {
7-
"phpunit/phpunit": "5.3.*"
7+
"phpunit/phpunit": "~5.3"
88
}
99
}

0 commit comments

Comments
 (0)