Skip to content

Commit 49d99b6

Browse files
committed
Merge branch 'release/0.16.0'
2 parents 6b86f45 + 0242e8a commit 49d99b6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ updates:
66
interval: "daily"
77
reviewers:
88
- krns
9-
- pehbehbeh
9+
- PKuebler
1010
assignees:
11-
- pehbehbeh
11+
- PKuebler

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4.13-fpm-alpine3.11
1+
FROM php:7.4.14-fpm-alpine
22

33
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
44
PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -34,6 +34,7 @@ RUN apk info \
3434
bash \
3535
git \
3636
nodejs \
37+
npm \
3738
composer \
3839
php7-tokenizer \
3940
php7-simplexml \
@@ -91,9 +92,8 @@ COPY ./usr/local/bin/startup-commands.php /usr/local/bin/
9192

9293
# configure composer
9394
ENV COMPOSER_ALLOW_SUPERUSER=1 \
94-
COMPOSER_MEMORY_LIMIT=-1
95-
ENV PATH="$PATH:/opt/app/vendor/bin:~/.composer/vendor/bin"
96-
RUN composer global require hirak/prestissimo
95+
COMPOSER_MEMORY_LIMIT=-1 \
96+
PATH="$PATH:/opt/app/vendor/bin:~/.composer/vendor/bin"
9797

9898
# configure yarn
9999
RUN yarn config set strict-ssl false && \

0 commit comments

Comments
 (0)