Skip to content

Commit a0eed2e

Browse files
committed
fixes for php-fpm config change
1 parent 06e8ebb commit a0eed2e

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

cmd/php/supervisor/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func buildFn(ctx *gcp.Context) error {
7070
overrides := webconfig.OverriddenProperties(ctx, runtimeConfig)
7171
webconfig.SetEnvVariables(l, overrides)
7272

73-
err = overrides.FromEnvironment(ctx)
73+
err = overrides.UpdateFromEnvironment(ctx)
7474
if err != nil {
7575
return err
7676
}

cmd/php/webconfig/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func buildFn(ctx *gcp.Context) error {
8282
webconfig.SetEnvVariables(l, overrides)
8383
}
8484

85-
err = overrides.FromEnvironment(ctx)
85+
err = overrides.UpdateFromEnvironment(ctx)
8686
if err != nil {
8787
return err
8888
}

pkg/webconfig/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ go_library(
99
],
1010
deps = [
1111
"//pkg/appyaml",
12+
"//pkg/env",
1213
"//pkg/gcpbuildpack",
1314
"//pkg/php",
1415
"@com_github_buildpacks_libcnb//:go_default_library",

pkg/webconfig/webconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type OverrideProperties struct {
6363
NginxServesStaticFiles bool
6464
}
6565

66-
func (overrides *OverrideProperties) FromEnvironment(ctx *gcp.Context) error {
66+
func (overrides *OverrideProperties) UpdateFromEnvironment(ctx *gcp.Context) error {
6767
if customNginxConf, present := os.LookupEnv(php.CustomNginxConfig); present {
6868
overrides.NginxConfOverride = true
6969
overrides.NginxConfOverrideFileName = filepath.Join(defaultRoot, customNginxConf)

0 commit comments

Comments
 (0)