From c3188995faa12bd67f5c6971573573e76b1f6d10 Mon Sep 17 00:00:00 2001 From: paketo-bot <62766270+paketo-bot@users.noreply.github.com> Date: Wed, 7 Sep 2022 08:16:37 -0700 Subject: [PATCH] Updates buildpacks in buildpack.toml (#581) * 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 <swigmore@vmware.com> --- buildpack.toml | 70 +++++++++---------- integration/builtin_server_test.go | 28 ++++---- integration/composer_test.go | 16 ++--- integration/httpd_test.go | 52 +++++++------- integration/memcached_session_handler_test.go | 12 ++-- integration/nginx_test.go | 56 +++++++-------- integration/redis_session_handler_test.go | 6 +- package.toml | 32 ++++----- 8 files changed, 136 insertions(+), 136 deletions(-) diff --git a/buildpack.toml b/buildpack.toml index 35134311..ad0e12af 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -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" diff --git a/integration/builtin_server_test.go b/integration/builtin_server_test.go index 6c7c95ab..6c831ee8 100644 --- a/integration/builtin_server_test.go +++ b/integration/builtin_server_test.go @@ -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() { @@ -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"})) diff --git a/integration/composer_test.go b/integration/composer_test.go index 577a0c89..e8ed77cc 100644 --- a/integration/composer_test.go +++ b/integration/composer_test.go @@ -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"))) }) }) } diff --git a/integration/httpd_test.go b/integration/httpd_test.go index f67e5078..ebdd1fed 100644 --- a/integration/httpd_test.go +++ b/integration/httpd_test.go @@ -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 { @@ -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"})) @@ -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"). diff --git a/integration/memcached_session_handler_test.go b/integration/memcached_session_handler_test.go index 4de7f169..38aa9d7c 100644 --- a/integration/memcached_session_handler_test.go +++ b/integration/memcached_session_handler_test.go @@ -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"))) }) }) } diff --git a/integration/nginx_test.go b/integration/nginx_test.go index 877b4fe2..2b060c05 100644 --- a/integration/nginx_test.go +++ b/integration/nginx_test.go @@ -76,17 +76,17 @@ func testPhpNginx(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("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).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 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).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 { @@ -133,18 +133,18 @@ func testPhpNginx(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("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("Procfile 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 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 Procfile"))) Expect(logs).To(ContainLines(ContainSubstring("web: procmgr-binary /layers/paketo-buildpacks_php-start/php-start/procs.yml && echo hi"))) - Expect(logs).To(ContainLines(ContainSubstring("Environment Variables Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Image Labels Buildpack"))) + 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": "fish-n-chips"})) @@ -196,12 +196,12 @@ func testPhpNginx(t *testing.T, context spec.G, it spec.S) { Execute(name, filepath.Join(source, "nginx_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("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("Paketo Buildpack for CA Certificates"))) + 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"))) container, err = docker.Container.Run. WithPublish("8080"). diff --git a/integration/redis_session_handler_test.go b/integration/redis_session_handler_test.go index c835ae67..2efb12b0 100644 --- a/integration/redis_session_handler_test.go +++ b/integration/redis_session_handler_test.go @@ -108,9 +108,9 @@ func testRedisSessionHandler(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("PHP Built-in Server Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Redis Session Handler Buildpack"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Distribution"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Built-in Server"))) + Expect(logs).To(ContainLines(ContainSubstring("Paketo Buildpack for PHP Redis Session Handler"))) }) }) } diff --git a/package.toml b/package.toml index df628373..533bd195 100644 --- a/package.toml +++ b/package.toml @@ -3,49 +3,49 @@ uri = "build/buildpack.tgz" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/httpd@0.5.0" + uri = "urn:cnb:registry:paketo-buildpacks/httpd@0.5.1" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/nginx@0.9.0" + uri = "urn:cnb:registry:paketo-buildpacks/nginx@0.10.0" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/composer@0.1.1" + uri = "urn:cnb:registry:paketo-buildpacks/composer@0.2.0" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/composer-install@0.1.2" + uri = "urn:cnb:registry:paketo-buildpacks/composer-install@0.1.3" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-dist@1.0.1" + uri = "urn:cnb:registry:paketo-buildpacks/php-dist@1.1.0" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-httpd@0.2.2" + uri = "urn:cnb:registry:paketo-buildpacks/php-httpd@0.2.3" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-nginx@0.1.2" + uri = "urn:cnb:registry:paketo-buildpacks/php-nginx@0.1.3" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-builtin-server@0.3.0" + uri = "urn:cnb:registry:paketo-buildpacks/php-builtin-server@0.3.1" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-fpm@0.1.3" + uri = "urn:cnb:registry:paketo-buildpacks/php-fpm@0.1.4" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-start@0.2.0" + uri = "urn:cnb:registry:paketo-buildpacks/php-start@0.2.1" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-redis-session-handler@0.1.0" + uri = "urn:cnb:registry:paketo-buildpacks/php-redis-session-handler@0.1.1" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/php-memcached-session-handler@0.1.0" + uri = "urn:cnb:registry:paketo-buildpacks/php-memcached-session-handler@0.1.1" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/procfile@5.3.0" + uri = "urn:cnb:registry:paketo-buildpacks/procfile@5.4.0" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/environment-variables@4.2.0" + uri = "urn:cnb:registry:paketo-buildpacks/environment-variables@4.3.0" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/image-labels@4.2.0" + uri = "urn:cnb:registry:paketo-buildpacks/image-labels@4.3.0" [[dependencies]] - uri = "urn:cnb:registry:paketo-buildpacks/ca-certificates@3.3.0" + uri = "urn:cnb:registry:paketo-buildpacks/ca-certificates@3.4.0"