Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
flavioheleno committed Apr 19, 2022
1 parent 28b4dea commit a469d82
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 26 deletions.
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"ext-pdo": "*",
"ext-posix": "*",
"ext-redis": "*",
"ext-zlib": "*",
"badges/poser": "^2.3",
"composer/metadata-minifier": "^1.0",
"composer/semver": "^3.2",
Expand Down Expand Up @@ -80,6 +81,7 @@
"infection": "vendor/bin/infection",
"lint": "vendor/bin/parallel-lint --exclude vendor .",
"phpcs": "vendor/bin/phpcs --standard=ruleset.xml src/ tests/",
"phpcbf": "vendor/bin/phpcbf --standard=ruleset.xml src/ tests/",
"phpstan": "vendor/bin/phpstan analyse --level=max --autoload-file=vendor/autoload.php bin/ public/ src/",
"phpunit": "vendor/bin/phpunit ./tests/ --coverage-html=./report/coverage/ --whitelist=./src/ --testdox-html=./report/testdox.html --disallow-test-output --process-isolation",
"psalm": "vendor/bin/psalm --taint-analysis",
Expand All @@ -99,6 +101,7 @@
"infection": "Runs mutation test framework",
"lint": "Runs complete codebase lint testing",
"phpcs": "Runs coding style checking",
"phpcbf": "Runs coding style fixer",
"phpstan": "Runs complete codebase static analysis",
"phpunit": "Runs unit and integration testing",
"psalm": "Runs complete codebase taint analysis",
Expand Down
51 changes: 28 additions & 23 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions docker/nginx.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ ENV TZ=:/etc/localtime
# default PHP-FPM upstream
ENV PHP_FPM=php-fpm

#============================================
# Force base image upgrade
#============================================
RUN apk add --no-cache --upgrade apk-tools && \
apk upgrade --available

# nginx settings
COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
COPY docker/nginx/default.conf /etc/nginx/conf.d/default.conf
Expand Down
24 changes: 21 additions & 3 deletions docker/php.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
#============================================
# BUILD
#============================================
FROM php:8.1.4-cli-alpine3.15 AS builder
FROM php:8.1.5-cli-alpine3.15 AS builder

# https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/
ENV TZ=:/etc/localtime

WORKDIR /usr/src

#============================================
# Force base image upgrade
#============================================
RUN apk add --no-cache --upgrade apk-tools && \
apk upgrade --available

#============================================
# Dist dependencies
#============================================
Expand Down Expand Up @@ -85,12 +91,18 @@ RUN composer install --no-progress --ignore-platform-reqs --no-dev --prefer-dist
#============================================
# COMMAND LINE INTERFACE
#============================================
FROM php:8.1.4-cli-alpine3.15 as cli
FROM php:8.1.5-cli-alpine3.15 as cli

# https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/
ENV TZ=:/etc/localtime
ENV PHP_ENV=development

#============================================
# Force base image upgrade
#============================================
RUN apk add --no-cache --upgrade apk-tools && \
apk upgrade --available

#============================================
# Settings
#============================================
Expand Down Expand Up @@ -159,12 +171,18 @@ CMD ["php"]
#============================================
# FPM SAPI
#============================================
FROM php:8.1.4-fpm-alpine3.15 as fpm
FROM php:8.1.5-fpm-alpine3.15 as fpm

# https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/
ENV TZ=:/etc/localtime
ENV PHP_ENV=development

#============================================
# Force base image upgrade
#============================================
RUN apk add --no-cache --upgrade apk-tools && \
apk upgrade --available

#============================================
# Settings
#============================================
Expand Down

0 comments on commit a469d82

Please sign in to comment.