Fixup bug with monolog 2->3
This commit is contained in:
parent
7760f61c09
commit
a1a6c22a08
7 changed files with 86 additions and 52 deletions
|
|
@ -14,7 +14,7 @@
|
|||
"guzzlehttp/guzzle": "^7.3",
|
||||
"twig/twig": "^3.0",
|
||||
"league/flysystem": "^2.1",
|
||||
"monolog/monolog": "^2.2",
|
||||
"monolog/monolog": "^3.4",
|
||||
"bramus/monolog-colored-line-formatter": "~3.0",
|
||||
"adambrett/shell-wrapper": "~1.0",
|
||||
"league/flysystem-aws-s3-v3": "^2.1",
|
||||
|
|
|
|||
53
bouncer/composer.lock
generated
53
bouncer/composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "958e2173310514bbba6c4e97cb64d5a1",
|
||||
"content-hash": "9d0282b41840d0b06ccd2411ce298ea9",
|
||||
"packages": [
|
||||
{
|
||||
"name": "adambrett/shell-wrapper",
|
||||
|
|
@ -246,24 +246,24 @@
|
|||
},
|
||||
{
|
||||
"name": "bramus/monolog-colored-line-formatter",
|
||||
"version": "3.1.0",
|
||||
"version": "3.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/bramus/monolog-colored-line-formatter.git",
|
||||
"reference": "cd1ada798fec11a5862cb67944c651b6a8e04911"
|
||||
"reference": "bbbffb43b0cbfff5cb6bb8e2c1dd15c99de8bd32"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/bramus/monolog-colored-line-formatter/zipball/cd1ada798fec11a5862cb67944c651b6a8e04911",
|
||||
"reference": "cd1ada798fec11a5862cb67944c651b6a8e04911",
|
||||
"url": "https://api.github.com/repos/bramus/monolog-colored-line-formatter/zipball/bbbffb43b0cbfff5cb6bb8e2c1dd15c99de8bd32",
|
||||
"reference": "bbbffb43b0cbfff5cb6bb8e2c1dd15c99de8bd32",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"bramus/ansi-php": "^3.0.3",
|
||||
"monolog/monolog": "~3.0",
|
||||
"php": "^8.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"monolog/monolog": "~3.0",
|
||||
"phpunit/phpunit": "~9.6"
|
||||
},
|
||||
"type": "library",
|
||||
|
|
@ -286,7 +286,7 @@
|
|||
"description": "Colored Line Formatter for Monolog",
|
||||
"support": {
|
||||
"issues": "https://github.com/bramus/monolog-colored-line-formatter/issues",
|
||||
"source": "https://github.com/bramus/monolog-colored-line-formatter/tree/3.1.0"
|
||||
"source": "https://github.com/bramus/monolog-colored-line-formatter/tree/3.1.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -294,7 +294,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2023-03-29T13:28:41+00:00"
|
||||
"time": "2023-04-11T12:52:29+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
|
|
@ -908,42 +908,41 @@
|
|||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "2.9.1",
|
||||
"version": "3.4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog.git",
|
||||
"reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
|
||||
"reference": "e2392369686d420ca32df3803de28b5d6f76867d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
|
||||
"reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/e2392369686d420ca32df3803de28b5d6f76867d",
|
||||
"reference": "e2392369686d420ca32df3803de28b5d6f76867d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.2",
|
||||
"psr/log": "^1.0.1 || ^2.0 || ^3.0"
|
||||
"php": ">=8.1",
|
||||
"psr/log": "^2.0 || ^3.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
|
||||
"psr/log-implementation": "3.0.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
|
||||
"aws/aws-sdk-php": "^3.0",
|
||||
"doctrine/couchdb": "~1.0@dev",
|
||||
"elasticsearch/elasticsearch": "^7 || ^8",
|
||||
"ext-json": "*",
|
||||
"graylog2/gelf-php": "^1.4.2 || ^2@dev",
|
||||
"guzzlehttp/guzzle": "^7.4",
|
||||
"graylog2/gelf-php": "^1.4.2 || ^2.0",
|
||||
"guzzlehttp/guzzle": "^7.4.5",
|
||||
"guzzlehttp/psr7": "^2.2",
|
||||
"mongodb/mongodb": "^1.8",
|
||||
"php-amqplib/php-amqplib": "~2.4 || ^3",
|
||||
"phpspec/prophecy": "^1.15",
|
||||
"phpstan/phpstan": "^0.12.91",
|
||||
"phpunit/phpunit": "^8.5.14",
|
||||
"predis/predis": "^1.1 || ^2.0",
|
||||
"rollbar/rollbar": "^1.3 || ^2 || ^3",
|
||||
"phpstan/phpstan": "^1.9",
|
||||
"phpstan/phpstan-deprecation-rules": "^1.0",
|
||||
"phpstan/phpstan-strict-rules": "^1.4",
|
||||
"phpunit/phpunit": "^10.1",
|
||||
"predis/predis": "^1.1 || ^2",
|
||||
"ruflin/elastica": "^7",
|
||||
"swiftmailer/swiftmailer": "^5.3|^6.0",
|
||||
"symfony/mailer": "^5.4 || ^6",
|
||||
"symfony/mime": "^5.4 || ^6"
|
||||
},
|
||||
|
|
@ -966,7 +965,7 @@
|
|||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-main": "2.x-dev"
|
||||
"dev-main": "3.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -994,7 +993,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/Seldaek/monolog/issues",
|
||||
"source": "https://github.com/Seldaek/monolog/tree/2.9.1"
|
||||
"source": "https://github.com/Seldaek/monolog/tree/3.4.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -1006,7 +1005,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-02-06T13:44:46+00:00"
|
||||
"time": "2023-06-21T08:46:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mtdowling/jmespath.php",
|
||||
|
|
|
|||
21
bouncer/docker-bake.hcl
Normal file
21
bouncer/docker-bake.hcl
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
group "default" {
|
||||
targets = [
|
||||
"bouncer",
|
||||
]
|
||||
}
|
||||
variable "PLATFORMS" {
|
||||
default = [
|
||||
"arm64",
|
||||
"amd64",
|
||||
]
|
||||
}
|
||||
target "bouncer" {
|
||||
context = "."
|
||||
dockerfile = "Dockerfile"
|
||||
platforms = PLATFORMS
|
||||
tags = [
|
||||
"benzine/bouncer:latest",
|
||||
"ghcr.io/benzine-framework/bouncer:latest",
|
||||
]
|
||||
target = "bouncer"
|
||||
}
|
||||
|
|
@ -2,42 +2,56 @@ version: "3.4"
|
|||
|
||||
services:
|
||||
bouncer:
|
||||
image: benzine/bouncer
|
||||
build:
|
||||
context: .
|
||||
target: bouncer
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
environment:
|
||||
- BOUNCER_LETSENCRYPT_MODE=production
|
||||
- BOUNCER_LETSENCRYPT_EMAIL=matthew@baggett.me
|
||||
- BOUNCER_S3_ENDPOINT=http://grey.ooo:9000
|
||||
- BOUNCER_S3_KEY_ID=geusebio
|
||||
- BOUNCER_S3_KEY_SECRET=teblE0neTf2NQcVFaZIRkSF44RscyQ3G
|
||||
- BOUNCER_S3_BUCKET=bouncer-certificates
|
||||
- BOUNCER_S3_USE_PATH_STYLE_ENDPOINT="yes"
|
||||
# environment:
|
||||
# - BOUNCER_LETSENCRYPT_MODE=production
|
||||
# - BOUNCER_LETSENCRYPT_EMAIL=matthew@baggett.me
|
||||
# - BOUNCER_S3_ENDPOINT=http://grey.ooo:9000
|
||||
# - BOUNCER_S3_KEY_ID=geusebio
|
||||
# - BOUNCER_S3_KEY_SECRET=teblE0neTf2NQcVFaZIRkSF44RscyQ3G
|
||||
# - BOUNCER_S3_BUCKET=bouncer-certificates
|
||||
# - BOUNCER_S3_USE_PATH_STYLE_ENDPOINT="yes"
|
||||
ports:
|
||||
- 80:80
|
||||
- 443:443
|
||||
- 127.0.0.5:80:80
|
||||
- 127.0.0.5:443:443
|
||||
depends_on:
|
||||
- web-a
|
||||
- web-b
|
||||
- web-c
|
||||
|
||||
web-a:
|
||||
image: benzine/php:nginx
|
||||
volumes:
|
||||
- ./test/public-web-a:/app/public
|
||||
build:
|
||||
context: .
|
||||
target: test-app-a
|
||||
environment:
|
||||
- BOUNCER_DOMAIN=a.web.grey.ooo
|
||||
- BOUNCER_LETSENCRYPT=true
|
||||
- BOUNCER_LETSENCRYPT=false
|
||||
- BOUNCER_TARGET_PORT=80
|
||||
ports:
|
||||
- 127.0.0.5:81:80
|
||||
|
||||
web-b:
|
||||
image: benzine/php:nginx
|
||||
volumes:
|
||||
- ./test/public-web-b:/app/public
|
||||
build:
|
||||
context: .
|
||||
target: test-app-b
|
||||
environment:
|
||||
- BOUNCER_DOMAIN=b.web.grey.ooo
|
||||
- BOUNCER_LETSENCRYPT=true
|
||||
- BOUNCER_LETSENCRYPT=false
|
||||
- BOUNCER_TARGET_PORT=80
|
||||
ports:
|
||||
- 127.0.0.5:82:80
|
||||
|
||||
web-c:
|
||||
image: benzine/php:nginx
|
||||
volumes:
|
||||
- ./test/public-web-c:/app/public
|
||||
build:
|
||||
context: .
|
||||
target: test-app-c
|
||||
environment:
|
||||
- BOUNCER_DOMAIN=c.web.grey.ooo
|
||||
- BOUNCER_LETSENCRYPT=true
|
||||
|
||||
- BOUNCER_LETSENCRYPT=false
|
||||
- BOUNCER_TARGET_PORT=80
|
||||
ports:
|
||||
- 127.0.0.5:83:80
|
||||
|
|
|
|||
BIN
bouncer/test/public-web-a/favicon.ico
Normal file
BIN
bouncer/test/public-web-a/favicon.ico
Normal file
Binary file not shown.
|
After Width: 64px | Height: 64px | Size: 34 KiB |
BIN
bouncer/test/public-web-b/favicon.ico
Normal file
BIN
bouncer/test/public-web-b/favicon.ico
Normal file
Binary file not shown.
|
After Width: 64px | Height: 64px | Size: 34 KiB |
BIN
bouncer/test/public-web-c/favicon.ico
Normal file
BIN
bouncer/test/public-web-c/favicon.ico
Normal file
Binary file not shown.
|
After Width: 64px | Height: 64px | Size: 34 KiB |
Loading…
Reference in a new issue