Nginxup

.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:

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/[email protected]](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)
 

examples/5.6/.lando.yml

@@ -25,12 +25,14 @@ 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
   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:

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:

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:

examples/7.2/.lando.yml

@@ -29,12 +29,14 @@ 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
   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:

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:

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."

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:

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."

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:

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."

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:

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."

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:

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."

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:

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."

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:

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"
   },