From 2a0719702d3f30b17cd88062c5ad78a7c2720431 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Oct 2024 10:04:37 -0400 Subject: [PATCH 1/6] #131: update to @lando/nginx@1.3.0 --- package-lock.json | 11 ++++++----- package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index d740b1c..3ca0c48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.3.0", "license": "GPL-3.0", "dependencies": { - "@lando/nginx": "^0.11.0", + "@lando/nginx": "^1.3.0", "lodash": "^4.17.21", "semver": "^7.3.7" }, @@ -1567,17 +1567,18 @@ } }, "node_modules/@lando/nginx": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@lando/nginx/-/nginx-0.11.0.tgz", - "integrity": "sha512-yoOaEHRXwaJDV6HH+BwMvfU2+dtbdrP/6RQi04dLTfsVLQm6TC49QGV3kL3xoVqv4fLIKDyLQqe2MUhJ8PROgw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@lando/nginx/-/nginx-1.3.0.tgz", + "integrity": "sha512-ln1pxPOLvX+eK7LDTqTKbwAGPdHoL3o1WBA2cKCP/czsTbAAjQauwtZ7YNGzFjmQgxV6ZxHFpMJvYGezPI9MQw==", "bundleDependencies": [ "lodash" ], + "license": "GPL-3.0", "dependencies": { "lodash": "^4.17.21" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@lando/nginx/node_modules/lodash": { diff --git a/package.json b/package.json index ceb014b..9691ba6 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "test": "npm run lint && npm run test:unit" }, "dependencies": { - "@lando/nginx": "^0.11.0", + "@lando/nginx": "^1.3.0", "lodash": "^4.17.21", "semver": "^7.3.7" }, From 7f73a87b6fab749120276b3d3ecfb339fd268b7f Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Oct 2024 10:11:16 -0400 Subject: [PATCH 2/6] CL and restore tests that should run now --- .github/workflows/pr-php-tests.yml | 10 +++++----- CHANGELOG.md | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr-php-tests.yml b/.github/workflows/pr-php-tests.yml index 2809697..a32a19a 100644 --- a/.github/workflows/pr-php-tests.yml +++ b/.github/workflows/pr-php-tests.yml @@ -12,10 +12,10 @@ jobs: fail-fast: false matrix: leia-test: - # - examples/5.6 - # - examples/7.0 - # - examples/7.1 - # - examples/7.2 + - examples/5.6 + - examples/7.0 + - examples/7.1 + - examples/7.2 - examples/7.3 - examples/7.4 - examples/8.0 @@ -25,7 +25,7 @@ jobs: - examples/custom - examples/composer - examples/php-extensions - # - examples/xdebug + - examples/xdebug lando-version: - 3-edge-slim os: diff --git a/CHANGELOG.md b/CHANGELOG.md index fad13c0..1514151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,8 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) -## Internal - -* Updated `ubuntu` test runners to `24.04` -* Updated `lando/setup-lando` to `v3` -* Updated tests to `lando exec` +* Fixed bug causing `CA` and `certs` to not be appropriately installed in the `appserver` when using `nginx` +* Updated to [@lando/nginx@1.3.0](https://github.com/lando/nginx/releases/tag/v1.3.0) [#131](https://github.com/lando/php/issues/131) +* Updated all images `>=5.6` to `gen4` ## v1.3.0 - [March 8, 2024](https://github.com/lando/php/releases/tag/v1.3.0) From 75d4ef288fba41d3c98a62f170a8359c530ab21f Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Oct 2024 10:27:29 -0400 Subject: [PATCH 3/6] #131: install curl in all custom nginx container tests --- examples/5.6/.lando.yml | 2 ++ examples/7.0/.lando.yml | 2 ++ examples/7.1/.lando.yml | 2 ++ examples/7.2/.lando.yml | 2 ++ examples/7.3/.lando.yml | 2 ++ examples/7.4/.lando.yml | 2 ++ examples/8.0/.lando.yml | 2 ++ examples/8.1/.lando.yml | 2 ++ examples/8.2/.lando.yml | 2 ++ examples/8.3/.lando.yml | 2 ++ 10 files changed, 20 insertions(+) diff --git a/examples/5.6/.lando.yml b/examples/5.6/.lando.yml index a5508be..7c6754a 100644 --- a/examples/5.6/.lando.yml +++ b/examples/5.6/.lando.yml @@ -31,6 +31,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/7.0/.lando.yml b/examples/7.0/.lando.yml index e18e504..870ce6d 100644 --- a/examples/7.0/.lando.yml +++ b/examples/7.0/.lando.yml @@ -36,6 +36,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/7.1/.lando.yml b/examples/7.1/.lando.yml index a928a0e..d1956be 100644 --- a/examples/7.1/.lando.yml +++ b/examples/7.1/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/7.2/.lando.yml b/examples/7.2/.lando.yml index ca2bdaf..046b3cf 100644 --- a/examples/7.2/.lando.yml +++ b/examples/7.2/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/7.3/.lando.yml b/examples/7.3/.lando.yml index ec1a3c4..fd4eb34 100644 --- a/examples/7.3/.lando.yml +++ b/examples/7.3/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/7.4/.lando.yml b/examples/7.4/.lando.yml index 3fffc28..981b7c5 100644 --- a/examples/7.4/.lando.yml +++ b/examples/7.4/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/8.0/.lando.yml b/examples/8.0/.lando.yml index c057ebe..406c39f 100644 --- a/examples/8.0/.lando.yml +++ b/examples/8.0/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/8.1/.lando.yml b/examples/8.1/.lando.yml index 141eae6..7fefbff 100644 --- a/examples/8.1/.lando.yml +++ b/examples/8.1/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/8.2/.lando.yml b/examples/8.2/.lando.yml index 59e142d..e5b7461 100644 --- a/examples/8.2/.lando.yml +++ b/examples/8.2/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: diff --git a/examples/8.3/.lando.yml b/examples/8.3/.lando.yml index f7ae539..4229171 100644 --- a/examples/8.3/.lando.yml +++ b/examples/8.3/.lando.yml @@ -35,6 +35,8 @@ services: OTHER: thing custom_nginx: build_as_root: + - apt-get update -y + - apt-get install curl -y - mkdir -p /app/test && touch /app/test/managed_build_step overrides: environment: From 896374af2b0e85d2b5a5baa6229cb4ec6faef7dd Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Oct 2024 10:40:18 -0400 Subject: [PATCH 4/6] update tests to reflect updated postgres client --- examples/7.3/README.md | 4 ++-- examples/7.4/README.md | 4 ++-- examples/8.0/README.md | 4 ++-- examples/8.1/README.md | 4 ++-- examples/8.2/README.md | 4 ++-- examples/8.3/README.md | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/7.3/README.md b/examples/7.3/README.md index 29073cc..2862615 100644 --- a/examples/7.3/README.md +++ b/examples/7.3/README.md @@ -27,8 +27,8 @@ Run the following commands to validate things are rolling as they should. # Should use 7.3 as the default php version lando exec defaults -- php -v | grep "PHP 7.3" -# Should use 10.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "10." +# Should use 13.x as the default postgresql-client version +lando exec defaults -- psql -V | grep "13." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | grep "2.4." diff --git a/examples/7.4/README.md b/examples/7.4/README.md index 7bc05cd..2c26fba 100644 --- a/examples/7.4/README.md +++ b/examples/7.4/README.md @@ -27,8 +27,8 @@ Run the following commands to validate things are rolling as they should. # Should use 7.4 as the default php version lando exec defaults -- php -v | grep "PHP 7.4" -# Should use 10.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "10." +# Should use 13.x as the default postgresql-client version +lando exec defaults -- psql -V | grep "13." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | grep "2.4." diff --git a/examples/8.0/README.md b/examples/8.0/README.md index 23b3da8..aed7656 100644 --- a/examples/8.0/README.md +++ b/examples/8.0/README.md @@ -27,8 +27,8 @@ Run the following commands to validate things are rolling as they should. # Should use 8.0 as the default php version lando exec defaults -- php -v | grep "PHP 8.0" -# Should use 10.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "10." +# Should use 13.x as the default postgresql-client version +lando exec defaults -- psql -V | grep "13." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | grep "2.4." diff --git a/examples/8.1/README.md b/examples/8.1/README.md index e1c9752..d4f6f9a 100644 --- a/examples/8.1/README.md +++ b/examples/8.1/README.md @@ -27,8 +27,8 @@ Run the following commands to validate things are rolling as they should. # Should use 8.1 as the default php version lando exec defaults -- php -v | grep "PHP 8.1" -# Should use 10.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "10." +# Should use 13.x as the default postgresql-client version +lando exec defaults -- psql -V | grep "13." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | grep "2.4." diff --git a/examples/8.2/README.md b/examples/8.2/README.md index 130dbeb..3ea08e4 100644 --- a/examples/8.2/README.md +++ b/examples/8.2/README.md @@ -27,8 +27,8 @@ Run the following commands to validate things are rolling as they should. # Should use 8.2 as the default php version lando exec defaults -- php -v | grep "PHP 8.2" -# Should use 10.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "10." +# Should use 13.x as the default postgresql-client version +lando exec defaults -- psql -V | grep "13." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | grep "2.4." diff --git a/examples/8.3/README.md b/examples/8.3/README.md index afe0cd6..880e55c 100644 --- a/examples/8.3/README.md +++ b/examples/8.3/README.md @@ -27,8 +27,8 @@ Run the following commands to validate things are rolling as they should. # Should use 8.3 as the default php version lando exec defaults -- php -v | grep "PHP 8.3" -# Should use 10.x as the default postgresql-client version -lando exec defaults -- psql -V | grep "10." +# Should use 13.x as the default postgresql-client version +lando exec defaults -- psql -V | grep "13." # Should use apache 2.4 as the default webserver version lando exec defaults -- apachectl -V | grep "2.4." From f99f248fd3bd9f0a96c28405a8a8d508f10b7520 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Oct 2024 10:44:27 -0400 Subject: [PATCH 5/6] #131: update custom test to pass through custom nginx version --- examples/custom/.lando.yml | 2 +- examples/custom/Dockerfile.node | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/custom/.lando.yml b/examples/custom/.lando.yml index cd2c5bb..d96d40a 100644 --- a/examples/custom/.lando.yml +++ b/examples/custom/.lando.yml @@ -10,7 +10,7 @@ services: dockerfile: Dockerfile.node custom81: type: php:custom - via: nginx + via: nginx:1.17 ssl: true webroot: web config: diff --git a/examples/custom/Dockerfile.node b/examples/custom/Dockerfile.node index 3f73dff..8bf7795 100644 --- a/examples/custom/Dockerfile.node +++ b/examples/custom/Dockerfile.node @@ -1,4 +1,4 @@ -FROM devwithlando/php:7.4-apache-4 +FROM devwithlando/php:7.4-apache-2 # Choose the major node version ENV NODE_VERSION=12 From 36dd62b6cc1785f3cb4e29a28e8aa658cc9f9d72 Mon Sep 17 00:00:00 2001 From: Mike Pirog Date: Thu, 17 Oct 2024 11:27:11 -0400 Subject: [PATCH 6/6] update all tests to use gen4 images where possible --- examples/5.6/.lando.yml | 2 +- examples/7.2/.lando.yml | 2 +- examples/custom/Dockerfile.node | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/5.6/.lando.yml b/examples/5.6/.lando.yml index 7c6754a..099b162 100644 --- a/examples/5.6/.lando.yml +++ b/examples/5.6/.lando.yml @@ -25,7 +25,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:5.6-fpm-2 + image: devwithlando/php:5.6-fpm-4 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/7.2/.lando.yml b/examples/7.2/.lando.yml index 046b3cf..82a31aa 100644 --- a/examples/7.2/.lando.yml +++ b/examples/7.2/.lando.yml @@ -29,7 +29,7 @@ services: config: php: config/php.ini overrides: - image: devwithlando/php:7.2-fpm-3 + image: devwithlando/php:7.2-fpm-4 environment: DUALBLADE: maxim OTHER: thing diff --git a/examples/custom/Dockerfile.node b/examples/custom/Dockerfile.node index 8bf7795..3f73dff 100644 --- a/examples/custom/Dockerfile.node +++ b/examples/custom/Dockerfile.node @@ -1,4 +1,4 @@ -FROM devwithlando/php:7.4-apache-2 +FROM devwithlando/php:7.4-apache-4 # Choose the major node version ENV NODE_VERSION=12