Skip to content

Commit 528ddf4

Browse files
authored
Merge pull request #28 from jakzal/composer-cleanup
Composer cleanup
2 parents 97b3418 + ad4ac64 commit 528ddf4

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ matrix:
1212
fast_finish: true
1313

1414
script:
15-
- if [ "$flavour" = "latest" ]; then make build; else make build-alpine; fi
15+
- if [ "$flavour" = "latest" ]; then make build-latest; else make build-alpine; fi
1616
- docker run -it --rm jakzal/phpqa:$flavour php /usr/local/bin/tools.php test
1717
- docker run -it --rm jakzal/phpqa:$flavour
1818

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends $TOOL_DEPS $BUI
2020
&& echo "memory_limit=-1" >> $PHP_INI_DIR/php.ini \
2121
&& echo "phar.readonly=0" >> $PHP_INI_DIR/php.ini \
2222
&& php /usr/local/bin/tools.php install \
23+
&& rm -rf ~/.composer/cache \
2324
&& apt-get purge -y --auto-remove $BUILD_DEPS
2425

2526
CMD php /usr/local/bin/tools.php list

Dockerfile-alpine

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ RUN apk add --no-cache --virtual .tool-deps $TOOL_DEPS $LIB_DEPS \
2121
&& echo "memory_limit=-1" >> $PHP_INI_DIR/php.ini \
2222
&& echo "phar.readonly=0" >> $PHP_INI_DIR/php.ini \
2323
&& php /usr/local/bin/tools.php install \
24+
&& rm -rf ~/.composer/cache \
2425
&& apk del .build-deps
2526

2627
CMD php /usr/local/bin/tools.php list

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
default: build
22

3-
build:
4-
docker build -t jakzal/phpqa:latest .
3+
build: build-latest build-alpine
54
.PHONY: build
65

6+
build-latest:
7+
docker build -t jakzal/phpqa:latest .
8+
.PHONY: build-latest
9+
710
build-alpine:
811
docker build -f Dockerfile-alpine -t jakzal/phpqa:alpine .
912
.PHONY: build-alpine

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ phpqa phpstan analyse src
8282
```bash
8383
git clone https://github.com/jakzal/phpqa.git
8484
cd phpqa
85-
make build
85+
make build-latest
8686
```
8787

8888
To build the alpine version:

0 commit comments

Comments
 (0)