Merge branch 'master' into dependabot/go_modules/plugins/scheduler-k3s/go_modules-fa444556ec
This commit is contained in:
@@ -1 +1 @@
|
||||
FROM byjg/easy-haproxy:6.5.1
|
||||
FROM byjg/easy-haproxy:6.5.2
|
||||
|
||||
@@ -1 +1 @@
|
||||
FROM timberio/vector:0.60.0-debian
|
||||
FROM timberio/vector:0.61.0-debian
|
||||
|
||||
@@ -26,7 +26,7 @@ require (
|
||||
github.com/onsi/gomega v1.44.0
|
||||
github.com/ryanuber/columnize v2.1.2+incompatible
|
||||
github.com/spf13/pflag v1.0.10
|
||||
github.com/traefik/traefik/v2 v2.11.60
|
||||
github.com/traefik/traefik/v2 v2.11.61
|
||||
golang.org/x/sync v0.24.0
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
@@ -153,7 +153,7 @@ require (
|
||||
go.yaml.in/yaml/v3 v3.0.5 // indirect
|
||||
golang.org/x/crypto v0.58.0 // indirect
|
||||
golang.org/x/mod v0.41.0 // indirect
|
||||
golang.org/x/net v0.61.0 // indirect
|
||||
golang.org/x/net v0.62.0 // indirect
|
||||
golang.org/x/oauth2 v0.37.0 // indirect
|
||||
golang.org/x/sys v0.49.0 // indirect
|
||||
golang.org/x/term v0.47.0 // indirect
|
||||
|
||||
@@ -357,8 +357,8 @@ github.com/tailscale/hujson v0.0.0-20250605163823-992244df8c5a h1:a6TNDN9CgG+cYj
|
||||
github.com/tailscale/hujson v0.0.0-20250605163823-992244df8c5a/go.mod h1:EbW0wDK/qEUYI0A5bqq0C2kF8JTQwWONmGDBbzsxxHo=
|
||||
github.com/traefik/paerser v0.2.2 h1:cpzW/ZrQrBh3mdwD/jnp6aXASiUFKOVr6ldP+keJTcQ=
|
||||
github.com/traefik/paerser v0.2.2/go.mod h1:7BBDd4FANoVgaTZG+yh26jI6CA2nds7D/4VTEdIsh24=
|
||||
github.com/traefik/traefik/v2 v2.11.60 h1:Er+VSOIMVk6awpIVwqSR7jIC9bXBBEHF29+CHeOliZM=
|
||||
github.com/traefik/traefik/v2 v2.11.60/go.mod h1:tnle1HBnPg47Bw2q9NDegW2P61ULztKQBw9AR/NMDMc=
|
||||
github.com/traefik/traefik/v2 v2.11.61 h1:u8s2pE7Ck4VCYoVbW9JRtzz4QJ3iGMqpZ2tXuzsBgdM=
|
||||
github.com/traefik/traefik/v2 v2.11.61/go.mod h1:jj0mKHVCWL7EboxVPxW7HnAE16LFryv2Nq/kNh9ueis=
|
||||
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
||||
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
|
||||
@@ -426,8 +426,8 @@ golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54=
|
||||
golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w=
|
||||
golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
|
||||
golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=
|
||||
golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw=
|
||||
golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI=
|
||||
golang.org/x/net v0.62.0 h1:18ELalfM5+XNRwzM2nYqXsZQ9ByS1uhj2O/U7+5jqRY=
|
||||
golang.org/x/net v0.62.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI=
|
||||
golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98=
|
||||
golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58=
|
||||
golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA=
|
||||
|
||||
8
tests/apps/multi/package-lock.json
generated
8
tests/apps/multi/package-lock.json
generated
@@ -11,7 +11,7 @@
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"bootstrap": "^5.3.8",
|
||||
"sass": "^1.106.1"
|
||||
"sass": "^1.107.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "24.x.x",
|
||||
@@ -432,9 +432,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/sass": {
|
||||
"version": "1.106.1",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.106.1.tgz",
|
||||
"integrity": "sha512-kD+Gi66vycZcbJt+42NC4z4PXNMcCajVrJPhqoKKXy5cOBMmJQt052CxIBcRjwYXeImHYOpu/ydWWGZQIenl7A==",
|
||||
"version": "1.107.0",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.107.0.tgz",
|
||||
"integrity": "sha512-+whPilvVNoAD57xvdIPLQT0gXo4RD1lHYw+Uw8zYHlojaeaMDxK14tc0JmEsz/XMns48h3lpypisMP+3E8eHQA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"chokidar": "^5.0.0",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Al Johri",
|
||||
"dependencies": {
|
||||
"bootstrap": "^5.3.8",
|
||||
"sass": "^1.106.1"
|
||||
"sass": "^1.107.0"
|
||||
},
|
||||
"description": "Test application for heroku multi buildpack.",
|
||||
"engines": {
|
||||
|
||||
12
tests/apps/php/composer.lock
generated
12
tests/apps/php/composer.lock
generated
@@ -605,16 +605,16 @@
|
||||
"packages-dev": [
|
||||
{
|
||||
"name": "heroku/heroku-buildpack-php",
|
||||
"version": "v299",
|
||||
"version": "v300",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/heroku/heroku-buildpack-php.git",
|
||||
"reference": "207f07a27f4644d0cf349febe88219d53695f57d"
|
||||
"reference": "b52841c0eea8c9dadf4d7dc4dc0736d4ee3d2b29"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/207f07a27f4644d0cf349febe88219d53695f57d",
|
||||
"reference": "207f07a27f4644d0cf349febe88219d53695f57d",
|
||||
"url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/b52841c0eea8c9dadf4d7dc4dc0736d4ee3d2b29",
|
||||
"reference": "b52841c0eea8c9dadf4d7dc4dc0736d4ee3d2b29",
|
||||
"shasum": ""
|
||||
},
|
||||
"bin": [
|
||||
@@ -644,9 +644,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/heroku/heroku-buildpack-php/issues",
|
||||
"source": "https://github.com/heroku/heroku-buildpack-php/tree/v299"
|
||||
"source": "https://github.com/heroku/heroku-buildpack-php/tree/v300"
|
||||
},
|
||||
"time": "2026-10-22T18:15:48+00:00"
|
||||
"time": "2026-10-29T18:03:00+00:00"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
||||
Reference in New Issue
Block a user