Skip to content

Commit

Permalink
Updates buildpacks in buildpack.toml (#581)
Browse files Browse the repository at this point in the history 
* Updating buildpacks in buildpack.toml

* Updating buildpacks in buildpack.toml

* modify test assertions

* Updating buildpacks in buildpack.toml

* Updating buildpacks in buildpack.toml

* fix test assertions

Co-authored-by: Sophie Wigmore <[email protected]>
  • Loading branch information
@paketo-bot
paketo-bot and Sophie Wigmore authored Sep 7, 2022
1 parent 45d3833 commit c318899
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 136 deletions.
70 changes: 35 additions & 35 deletions buildpack.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,166 +17,166 @@ api = "0.7"
[[order.group]]
id = "paketo-buildpacks/ca-certificates"
optional = true
version = "3.3.0"
version = "3.4.0"

[[order.group]]
id = "paketo-buildpacks/php-dist"
version = "1.0.1"
version = "1.1.0"

[[order.group]]
id = "paketo-buildpacks/composer"
optional = true
version = "0.1.1"
version = "0.2.0"

[[order.group]]
id = "paketo-buildpacks/composer-install"
optional = true
version = "0.1.2"
version = "0.1.3"

[[order.group]]
id = "paketo-buildpacks/httpd"
version = "0.5.0"
version = "0.5.1"

[[order.group]]
id = "paketo-buildpacks/php-fpm"
version = "0.1.3"
version = "0.1.4"

[[order.group]]
id = "paketo-buildpacks/php-httpd"
version = "0.2.2"
version = "0.2.3"

[[order.group]]
id = "paketo-buildpacks/php-memcached-session-handler"
optional = true
version = "0.1.0"
version = "0.1.1"

[[order.group]]
id = "paketo-buildpacks/php-redis-session-handler"
optional = true
version = "0.1.0"
version = "0.1.1"

[[order.group]]
id = "paketo-buildpacks/php-start"
version = "0.2.0"
version = "0.2.1"

[[order.group]]
id = "paketo-buildpacks/procfile"
optional = true
version = "5.3.0"
version = "5.4.0"

[[order.group]]
id = "paketo-buildpacks/environment-variables"
optional = true
version = "4.2.0"
version = "4.3.0"

[[order.group]]
id = "paketo-buildpacks/image-labels"
optional = true
version = "4.2.0"
version = "4.3.0"

[[order]]

[[order.group]]
id = "paketo-buildpacks/ca-certificates"
optional = true
version = "3.3.0"
version = "3.4.0"

[[order.group]]
id = "paketo-buildpacks/php-dist"
version = "1.0.1"
version = "1.1.0"

[[order.group]]
id = "paketo-buildpacks/composer"
optional = true
version = "0.1.1"
version = "0.2.0"

[[order.group]]
id = "paketo-buildpacks/composer-install"
optional = true
version = "0.1.2"
version = "0.1.3"

[[order.group]]
id = "paketo-buildpacks/nginx"
version = "0.9.0"
version = "0.10.0"

[[order.group]]
id = "paketo-buildpacks/php-fpm"
version = "0.1.3"
version = "0.1.4"

[[order.group]]
id = "paketo-buildpacks/php-nginx"
version = "0.1.2"
version = "0.1.3"

[[order.group]]
id = "paketo-buildpacks/php-memcached-session-handler"
optional = true
version = "0.1.0"
version = "0.1.1"

[[order.group]]
id = "paketo-buildpacks/php-redis-session-handler"
optional = true
version = "0.1.0"
version = "0.1.1"

[[order.group]]
id = "paketo-buildpacks/php-start"
version = "0.2.0"
version = "0.2.1"

[[order.group]]
id = "paketo-buildpacks/procfile"
optional = true
version = "5.3.0"
version = "5.4.0"

[[order.group]]
id = "paketo-buildpacks/environment-variables"
optional = true
version = "4.2.0"
version = "4.3.0"

[[order.group]]
id = "paketo-buildpacks/image-labels"
optional = true
version = "4.2.0"
version = "4.3.0"

[[order]]

[[order.group]]
id = "paketo-buildpacks/php-dist"
version = "1.0.1"
version = "1.1.0"

[[order.group]]
id = "paketo-buildpacks/composer"
optional = true
version = "0.1.1"
version = "0.2.0"

[[order.group]]
id = "paketo-buildpacks/composer-install"
optional = true
version = "0.1.2"
version = "0.1.3"

[[order.group]]
id = "paketo-buildpacks/php-builtin-server"
version = "0.3.0"
version = "0.3.1"

[[order.group]]
id = "paketo-buildpacks/php-memcached-session-handler"
optional = true
version = "0.1.0"
version = "0.1.1"

[[order.group]]
id = "paketo-buildpacks/php-redis-session-handler"
optional = true
version = "0.1.0"
version = "0.1.1"

[[order.group]]
id = "paketo-buildpacks/procfile"
optional = true
version = "5.3.0"
version = "5.4.0"

[[order.group]]
id = "paketo-buildpacks/environment-variables"
optional = true
version = "4.2.0"
version = "4.3.0"

[[order.group]]
id = "paketo-buildpacks/image-labels"
optional = true
version = "4.2.0"
version = "4.3.0"
28 changes: 14 additions & 14 deletions integration/builtin_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ func testPhpBuiltinServer(t *testing.T, context spec.G, it spec.S) {

Eventually(container).Should(Serve(ContainSubstring("SUCCESS: date loads.")).OnPort(8080).WithEndpoint("/index.php?date"))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Built-in Server Buildpack")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Procfile Buildpack")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Environment Variables Buildpack")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Image Labels Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer Install")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Built-in Server")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Paketo for Procfile")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Paketo for Environment Variables")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Paketo for Image Labels")))
})

context("using optional utility buildpacks", func() {
Expand Down Expand Up @@ -114,13 +114,13 @@ func testPhpBuiltinServer(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(Serve(ContainSubstring("SUCCESS: date loads.")).OnPort(8080).WithEndpoint("/index.php?date"))
Expect(logs).To(ContainLines(ContainSubstring(`web: php -S 0.0.0.0:"${PORT:-80}" -t htdocs && echo hi`)))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Built-in Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Procfile Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Environment Variables Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Image Labels Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer Install")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Built-in Server")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Procfile")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Environment Variables")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Image Labels")))

Expect(image.Buildpacks[5].Key).To(Equal("paketo-buildpacks/environment-variables"))
Expect(image.Buildpacks[5].Layers["environment-variables"].Metadata["variables"]).To(Equal(map[string]interface{}{"SOME_VARIABLE": "stew-peas"}))
Expand Down
16 changes: 8 additions & 8 deletions integration/composer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ func testComposer(t *testing.T, context spec.G, it spec.S) {

Expect(logs).To(ContainLines(ContainSubstring("Detected existing vendored packages, will run 'composer install' with those packages")))

Expect(logs).To(ContainLines(ContainSubstring("CA Certificates Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Apache HTTP Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP HTTPD Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for CA Certificates")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer Install")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Apache HTTP Server")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP FPM")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP HTTPD")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Start")))
})
})
}
52 changes: 26 additions & 26 deletions integration/httpd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ func testPhpHttpd(t *testing.T, context spec.G, it spec.S) {

Eventually(container).Should(Serve(ContainSubstring("SUCCESS: date loads.")).OnPort(8080).WithEndpoint("/index.php?date"))

Expect(logs).To(ContainLines(ContainSubstring("CA Certificates Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Apache HTTP Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP HTTPD Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Procfile Buildpack")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Environment Variables Buildpack")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Image Labels Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for CA Certificates")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer Install")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Apache HTTP Server")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP FPM")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP HTTPD")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Start")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Paketo Buildpack for Procfile")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Paketo Buildpack for Environment Variables")))
Expect(logs).NotTo(ContainLines(ContainSubstring("Paketo Buildpack for Image Labels")))

// Ensure FPM is running as well
Eventually(func() string {
Expand Down Expand Up @@ -134,16 +134,16 @@ func testPhpHttpd(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(Serve(ContainSubstring("SUCCESS: date loads.")).OnPort(8080).WithEndpoint("/index.php?date"))
Expect(logs).To(ContainLines(ContainSubstring("web: php-fpm -y $PHP_FPM_PATH & httpd -f $PHP_HTTPD_PATH -k start -DFOREGROUND && echo hi")))

Expect(logs).To(ContainLines(ContainSubstring("CA Certificates Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Apache HTTP Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP HTTPD Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Procfile Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Environment Variables Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Image Labels Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for CA Certificates")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Composer Install")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Apache HTTP Server")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP FPM")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP HTTPD")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Procfile")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Environment Variables")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Image Labels")))

Expect(image.Buildpacks[9].Key).To(Equal("paketo-buildpacks/environment-variables"))
Expect(image.Buildpacks[9].Layers["environment-variables"].Metadata["variables"]).To(Equal(map[string]interface{}{"SOME_VARIABLE": "stew-peas"}))
Expand Down Expand Up @@ -195,11 +195,11 @@ func testPhpHttpd(t *testing.T, context spec.G, it spec.S) {
Execute(name, filepath.Join(source, "httpd_app"))
Expect(err).NotTo(HaveOccurred())

Expect(logs).To(ContainLines(ContainSubstring("CA Certificates Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Apache HTTP Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP HTTPD Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for CA Certificates")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Apache HTTP Server")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP FPM")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP HTTPD")))

container, err = docker.Container.Run.
WithPublish("8080").
Expand Down
12 changes: 6 additions & 6 deletions integration/memcached_session_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ func testMemcachedSessionHandler(t *testing.T, context spec.G, it spec.S) {
Eventually(container).Should(Serve(ContainSubstring("1")).WithClient(client).OnPort(8080).WithEndpoint("/index.php"))
Eventually(container).Should(Serve(ContainSubstring("2")).WithClient(client).OnPort(8080).WithEndpoint("/index.php"))

Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("PHP Memcached Session Handler Buildpack")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for Nginx Server")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP FPM")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Nginx")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Start")))
Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Memcached Session Handler")))
})
})
}
Loading

0 comments on commit c318899

Please sign in to comment.