@lando/drupal 1.13.0 → 1.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintignore +5 -0
- package/CHANGELOG.md +15 -0
- package/README.md +1 -1
- package/builders/_drupaly.js +18 -0
- package/netlify.toml +1 -1
- package/node_modules/@lando/mariadb/CHANGELOG.md +4 -0
- package/node_modules/@lando/mariadb/builders/mariadb.js +4 -3
- package/node_modules/@lando/mariadb/package.json +5 -5
- package/node_modules/@lando/php/AGENTS.md +81 -0
- package/node_modules/@lando/php/CHANGELOG.md +25 -0
- package/node_modules/@lando/php/README.md +4 -1
- package/node_modules/@lando/php/builders/php.js +39 -5
- package/node_modules/@lando/php/images/5.6-apache/Dockerfile +9 -4
- package/node_modules/@lando/php/images/5.6-fpm/Dockerfile +9 -4
- package/node_modules/@lando/php/images/7.0-apache/Dockerfile +9 -4
- package/node_modules/@lando/php/images/7.0-fpm/Dockerfile +9 -4
- package/node_modules/@lando/php/images/7.1-apache/Dockerfile +1 -1
- package/node_modules/@lando/php/images/7.1-fpm/Dockerfile +1 -1
- package/node_modules/@lando/php/images/7.2-apache/Dockerfile +1 -1
- package/node_modules/@lando/php/images/7.2-fpm/Dockerfile +1 -1
- package/node_modules/@lando/php/images/7.3-apache/Dockerfile +1 -1
- package/node_modules/@lando/php/images/7.3-fpm/Dockerfile +1 -1
- package/node_modules/@lando/php/images/7.4-apache/Dockerfile +2 -2
- package/node_modules/@lando/php/images/7.4-fpm/Dockerfile +2 -2
- package/node_modules/@lando/php/images/8.0-apache/Dockerfile +2 -2
- package/node_modules/@lando/php/images/8.0-fpm/Dockerfile +2 -2
- package/node_modules/@lando/php/images/8.1-apache/Dockerfile +1 -1
- package/node_modules/@lando/php/images/8.1-fpm/Dockerfile +1 -1
- package/node_modules/@lando/php/images/8.2-apache/Dockerfile +1 -1
- package/node_modules/@lando/php/images/8.2-fpm/Dockerfile +1 -1
- package/node_modules/@lando/php/images/8.3-apache/Dockerfile +23 -22
- package/node_modules/@lando/php/images/8.3-fpm/Dockerfile +22 -22
- package/node_modules/@lando/php/images/8.4-apache/Dockerfile +21 -22
- package/node_modules/@lando/php/images/8.4-fpm/Dockerfile +21 -22
- package/node_modules/@lando/php/images/8.5-apache/Dockerfile +77 -0
- package/node_modules/@lando/php/images/8.5-fpm/Dockerfile +78 -0
- package/node_modules/@lando/php/netlify.toml +1 -1
- package/node_modules/@lando/php/package.json +5 -5
- package/node_modules/@lando/php/scripts/install-db-client.sh +31 -0
- package/node_modules/@lando/php/scripts/mariadb-compat-install.sh +42 -0
- package/node_modules/@lando/php/scripts/mysql-client-install.sh +62 -0
- package/node_modules/@lando/postgres/CHANGELOG.md +4 -0
- package/node_modules/@lando/postgres/builders/postgres.js +2 -1
- package/node_modules/@lando/postgres/package.json +5 -5
- package/package.json +8 -8
package/.eslintignore
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
|
|
2
2
|
|
|
3
|
+
## v1.14.0 - [February 19, 2026](https://github.com/lando/drupal/releases/tag/v1.14.0)
|
|
4
|
+
|
|
5
|
+
* Added `drush_uri` configuration option to set `DRUSH_OPTIONS_URI` environment variable in the appserver service with SSL support
|
|
6
|
+
* Updated `@lando/php` to `^1.11.0` for MySQL client auto-detection fix
|
|
7
|
+
* Updated to [@lando/php@1.10.0](https://github.com/lando/php/releases/tag/v1.10.0)
|
|
8
|
+
* Updated to [@lando/mariadb@1.8.0](https://github.com/lando/mariadb/releases/tag/v1.8.0)
|
|
9
|
+
* Updated to [@lando/postgres@1.6.0](https://github.com/lando/postgres/releases/tag/v1.6.0)
|
|
10
|
+
* Updated to [@lando/argv@1.2.0](https://github.com/lando/argv/releases/tag/v1.2.0)
|
|
11
|
+
* Fixed release workflow to trigger npm publish on `published` event
|
|
12
|
+
* Fixed drupal-multisite docs [#175](https://github.com/lando/drupal/pull/175)
|
|
13
|
+
* Updated documented dependency versions
|
|
14
|
+
* Updated supported PHP version range to 8.5+
|
|
15
|
+
* Added dependabot config
|
|
16
|
+
* Bumped actions group (checkout, setup-node, cache)
|
|
17
|
+
|
|
3
18
|
## v1.13.0 - [September 17, 2025](https://github.com/lando/drupal/releases/tag/v1.13.0)
|
|
4
19
|
|
|
5
20
|
* Added default config values to the `.lando.yml` file after init.
|
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
This is the _official_ [Lando](https://lando.dev) plugin for [Drupal](https://www.drupal.org/). When installed it...
|
|
4
4
|
|
|
5
5
|
* Allows users to run `drupal` cms
|
|
6
|
-
* Allows users to configure `php` version from `5.3` all the way to `8.
|
|
6
|
+
* Allows users to configure `php` version from `5.3` all the way to `8.5+`
|
|
7
7
|
* Allows users to configure `webroot`
|
|
8
8
|
* Allows users to configure web server to (`apache` or `nginx`)
|
|
9
9
|
* Allows users to configure database backend to (`mariadb`, `mysql`, or `postgres`)
|
package/builders/_drupaly.js
CHANGED
|
@@ -242,6 +242,7 @@ module.exports = {
|
|
|
242
242
|
webroot: '.',
|
|
243
243
|
xdebug: false,
|
|
244
244
|
proxy: {},
|
|
245
|
+
drush_uri: null,
|
|
245
246
|
},
|
|
246
247
|
builder: (parent, config) => class LandoDrupal extends parent {
|
|
247
248
|
constructor(id, options = {}) {
|
|
@@ -290,6 +291,23 @@ module.exports = {
|
|
|
290
291
|
options.services = _.merge({}, getServices(options), options.services);
|
|
291
292
|
options.tooling = _.merge({}, getTooling(options), options.tooling);
|
|
292
293
|
|
|
294
|
+
// Set DRUSH_OPTIONS_URI based on drush_uri config or proxy settings
|
|
295
|
+
let drushUri = options.drush_uri;
|
|
296
|
+
if (!drushUri) {
|
|
297
|
+
const proxyUrl = options.proxy[options.proxyService]?.[0];
|
|
298
|
+
if (proxyUrl) {
|
|
299
|
+
// Check SSL setting for the proxy service
|
|
300
|
+
const proxyServiceSsl = options.services[options.proxyService]?.ssl;
|
|
301
|
+
const ssl = proxyServiceSsl !== undefined ? proxyServiceSsl : options.services.appserver?.ssl;
|
|
302
|
+
drushUri = ssl ? `https://${proxyUrl}` : `http://${proxyUrl}`;
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
if (drushUri) {
|
|
307
|
+
options.services.appserver.environment = options.services.appserver.environment || {};
|
|
308
|
+
options.services.appserver.environment.DRUSH_OPTIONS_URI = drushUri;
|
|
309
|
+
}
|
|
310
|
+
|
|
293
311
|
// Send downstream
|
|
294
312
|
super(id, _.merge({}, config, options));
|
|
295
313
|
}
|
package/netlify.toml
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
|
|
2
2
|
|
|
3
|
+
## v1.8.0 - [September 8, 2025](https://github.com/lando/mariadb/releases/tag/v1.8.0)
|
|
4
|
+
|
|
5
|
+
* Added support for MariaDB 11.8
|
|
6
|
+
|
|
3
7
|
## v1.7.0 - [August 30, 2025](https://github.com/lando/mariadb/releases/tag/v1.7.0)
|
|
4
8
|
|
|
5
9
|
* Switched images to [bitnamilegacy](https://github.com/bitnami/containers/issues/83267) namespace
|
|
@@ -9,12 +9,13 @@ module.exports = {
|
|
|
9
9
|
name: 'mariadb',
|
|
10
10
|
config: {
|
|
11
11
|
version: '10.3',
|
|
12
|
-
supported: ['11.7', '11.6', '11.5', '11.4', '11.3', '11.2',
|
|
13
|
-
'11.0', '10.11', '10.10', '10.9', '10.8', '10.7', '10.6',
|
|
14
|
-
'10.4', '10.3', '10.2', '10.1'],
|
|
12
|
+
supported: ['11.8', '11.7', '11.6', '11.5', '11.4', '11.3', '11.2',
|
|
13
|
+
'11.1', '11.0', '10.11', '10.10', '10.9', '10.8', '10.7', '10.6',
|
|
14
|
+
'10.5', '10.4', '10.3', '10.2', '10.1'],
|
|
15
15
|
legacy: ['11.7', '11.6', '11.5', '11.3', '11.2', '11.1', '11.0',
|
|
16
16
|
'10.10', '10.9', '10.8', '10.7', '10.4', '10.3', '10.2', '10.1'],
|
|
17
17
|
pinPairs: {
|
|
18
|
+
'11.8': 'bitnamilegacy/mariadb:11.8.3-debian-12-r0',
|
|
18
19
|
'11.7': 'bitnamilegacy/mariadb:11.7.2-debian-12-r0',
|
|
19
20
|
'11.6': 'bitnamilegacy/mariadb:11.6.2-debian-12-r0',
|
|
20
21
|
'11.5': 'bitnamilegacy/mariadb:11.5.2-debian-12-r7',
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lando/mariadb",
|
|
3
3
|
"description": "A Lando plugin that provides a tight integration with mariadb.",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.8.0",
|
|
5
5
|
"author": "Mike Pirog @pirog",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": "lando/mariadb",
|
|
@@ -62,9 +62,9 @@
|
|
|
62
62
|
"lodash"
|
|
63
63
|
],
|
|
64
64
|
"dist": {
|
|
65
|
-
"integrity": "sha512-
|
|
66
|
-
"shasum": "
|
|
67
|
-
"filename": "lando-mariadb-1.
|
|
68
|
-
"unpackedSize":
|
|
65
|
+
"integrity": "sha512-PmnBqSulIxzB3/RfG4quKqBVdCyy9gw0DNBhz9sDiGjf3Pm2N5+QEEko+zNzhlLNy0C4nbfeQy3pCEyw1otclg==",
|
|
66
|
+
"shasum": "2ba1368e8c58386f966e631f88b7a1c335217080",
|
|
67
|
+
"filename": "lando-mariadb-1.8.0.tgz",
|
|
68
|
+
"unpackedSize": 1429885
|
|
69
69
|
}
|
|
70
70
|
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
# PROJECT KNOWLEDGE BASE
|
|
2
|
+
|
|
3
|
+
**Generated:** 2026-01-09
|
|
4
|
+
**Commit:** 355c304
|
|
5
|
+
**Branch:** main
|
|
6
|
+
|
|
7
|
+
## OVERVIEW
|
|
8
|
+
|
|
9
|
+
Lando PHP plugin - provides PHP services (5.3-8.5) via nginx/apache/cli with composer, xdebug support. Part of @lando ecosystem.
|
|
10
|
+
|
|
11
|
+
## STRUCTURE
|
|
12
|
+
|
|
13
|
+
```
|
|
14
|
+
lando--php/
|
|
15
|
+
├── builders/ # Service builders (php.js = main logic)
|
|
16
|
+
├── config/ # PHP/nginx config templates
|
|
17
|
+
├── utils/ # Helper functions
|
|
18
|
+
├── examples/ # Version-specific test fixtures (php-*)
|
|
19
|
+
├── test/ # Unit tests (placeholder)
|
|
20
|
+
├── docs/ # Project documentation markdown files and associated Vitepress site
|
|
21
|
+
├── scripts/ # Helper scripts for build/install/etc
|
|
22
|
+
└── images/ # Docker image definitions for various PHP versions
|
|
23
|
+
```
|
|
24
|
+
|
|
25
|
+
## WHERE TO LOOK
|
|
26
|
+
|
|
27
|
+
| Task | Location | Notes |
|
|
28
|
+
|------|----------|-------|
|
|
29
|
+
| PHP version logic | `builders/php.js` | LandoPhp class, version detection |
|
|
30
|
+
| Nginx wrapper | `builders/php-nginx.js` | Extends @lando/nginx |
|
|
31
|
+
| Composer install | `builders/php.js:getDefaultComposerVersion()` | Version auto-detection |
|
|
32
|
+
| Xdebug config | `builders/php.js:xdebugConfig()` | Per-version handling |
|
|
33
|
+
| PHP config templates | `config/*.conf.tpl` | EJS templates |
|
|
34
|
+
| Add CLI/build steps | `utils/add-build-step.js` | Front/back insertion |
|
|
35
|
+
| Install command gen | `utils/get-install-commands.js` | Package manager abstraction |
|
|
36
|
+
|
|
37
|
+
## CODE MAP
|
|
38
|
+
|
|
39
|
+
| Symbol | Type | Location | Role |
|
|
40
|
+
|--------|------|----------|------|
|
|
41
|
+
| `LandoPhp` | class | builders/php.js:18 | Main service builder |
|
|
42
|
+
| `getDefaultComposerVersion` | fn | builders/php.js | Composer version detection |
|
|
43
|
+
| `nginxConfig` | fn | builders/php.js | Nginx service config |
|
|
44
|
+
| `xdebugConfig` | fn | builders/php.js | Xdebug version handling |
|
|
45
|
+
| `parseApache/Cli/Nginx` | fns | builders/php.js | Via-specific parsing |
|
|
46
|
+
| `addBuildStep` | fn | utils/add-build-step.js | Build step insertion |
|
|
47
|
+
| `getInstallCommands` | fn | utils/get-install-commands.js | Install command gen |
|
|
48
|
+
| `cloneOverrides` | fn | utils/clone-overrides.js | Deep clone sans image/build |
|
|
49
|
+
|
|
50
|
+
## CONVENTIONS
|
|
51
|
+
|
|
52
|
+
- **ESLint**: Google style, max-len 140, JSDoc required for functions
|
|
53
|
+
- **Images**: `devwithlando/php:{version}-{via}` format
|
|
54
|
+
- **Versions**: Supported 5.3-8.5, legacy removed at 8.x
|
|
55
|
+
- **Via options**: apache (default), nginx, cli
|
|
56
|
+
- **Composer**: v1 for PHP <7.2, v2 otherwise
|
|
57
|
+
|
|
58
|
+
## ANTI-PATTERNS
|
|
59
|
+
|
|
60
|
+
- Don't modify `index.js` - intentionally empty placeholder
|
|
61
|
+
- Don't add dependencies without checking @lando/nginx compatibility
|
|
62
|
+
- examples/* are test fixtures - structured identically per version
|
|
63
|
+
|
|
64
|
+
## COMMANDS
|
|
65
|
+
|
|
66
|
+
```bash
|
|
67
|
+
# Development
|
|
68
|
+
npm run lint # ESLint check
|
|
69
|
+
npm run test:unit # Mocha unit tests
|
|
70
|
+
npm run test:leia # Leia integration tests
|
|
71
|
+
|
|
72
|
+
# Coverage
|
|
73
|
+
nyc covers: lib/, recipes/, services/, types/
|
|
74
|
+
```
|
|
75
|
+
|
|
76
|
+
## NOTES
|
|
77
|
+
|
|
78
|
+
- `plugin.yml` has `legacy: true` for Lando v3 compatibility
|
|
79
|
+
- Root `.lando.yml` is for docs site (vitepress), not plugin testing
|
|
80
|
+
- Test file `test/auth.spec.js` is placeholder ("should have tests")
|
|
81
|
+
- PHP config uses EJS templates (`.conf.tpl` extension)
|
|
@@ -1,5 +1,30 @@
|
|
|
1
1
|
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
|
|
2
2
|
|
|
3
|
+
## v1.11.0 - [February 19, 2026](https://github.com/lando/php/releases/tag/v1.11.0)
|
|
4
|
+
|
|
5
|
+
* Fixed database client auto-detection for recipe-based services [#223](https://github.com/lando/php/pull/223)
|
|
6
|
+
|
|
7
|
+
## v1.10.0 - [February 18, 2026](https://github.com/lando/php/releases/tag/v1.10.0)
|
|
8
|
+
|
|
9
|
+
* Added database client auto-detection and version matching [#212](https://github.com/lando/php/pull/212)
|
|
10
|
+
* Added Docker image build status badge to README
|
|
11
|
+
* Added GD AVIF support verification for PHP 8.3+ [#219](https://github.com/lando/php/pull/219)
|
|
12
|
+
* Fixed composer install ordering to run before user build steps
|
|
13
|
+
* Fixed MariaDB wrapper script command names and test auto-detection [#212](https://github.com/lando/php/pull/212)
|
|
14
|
+
* Fixed typo in documentation
|
|
15
|
+
* Updated Docker image base version to Debian 13
|
|
16
|
+
* Updated Docker image tags from -6 to -7
|
|
17
|
+
* Updated Node.js 14.x to 20.x in test examples [#215](https://github.com/lando/php/pull/215)
|
|
18
|
+
* Updated `actions/cache` from 4 to 5
|
|
19
|
+
* Updated `actions/checkout` from 4 to 6
|
|
20
|
+
|
|
21
|
+
## v1.9.0 - [December 5, 2025](https://github.com/lando/php/releases/tag/v1.9.0)
|
|
22
|
+
|
|
23
|
+
* Added support for PHP 8.5
|
|
24
|
+
* Added Debian 13 (trixie) base images for PHP 8.3-8.5
|
|
25
|
+
* Changed PHP 7.4 and 8.0 images to use MariaDB `archive.mariadb.org` apt repository
|
|
26
|
+
* Fixed expired keys preventing stretch-based images from building
|
|
27
|
+
|
|
3
28
|
## v1.8.0 - [September 2, 2025](https://github.com/lando/php/releases/tag/v1.8.0)
|
|
4
29
|
|
|
5
30
|
* Removed automatic installation of `hirak/prestissimo` for `composer:1`
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
# PHP Lando Plugin
|
|
2
2
|
|
|
3
|
+
[](https://github.com/lando/php/actions/workflows/build-php-images.yml)
|
|
4
|
+
|
|
3
5
|
This is the _official_ [Lando](https://lando.dev) plugin for [PHP](https://php.net). When installed it...
|
|
4
6
|
|
|
5
7
|
* Allows users to run various `php` versions
|
|
@@ -16,7 +18,7 @@ Add a `php` service to your Landofile
|
|
|
16
18
|
```yaml
|
|
17
19
|
services:
|
|
18
20
|
myservice:
|
|
19
|
-
type: php:8.
|
|
21
|
+
type: php:8.5
|
|
20
22
|
via: nginx
|
|
21
23
|
webroot: www
|
|
22
24
|
```
|
|
@@ -43,6 +45,7 @@ We try to log all changes big and small in both [THE CHANGELOG](https://github.c
|
|
|
43
45
|
|
|
44
46
|
* [@pirog](https://github.com/pirog)
|
|
45
47
|
* [@reynoldsalec](https://github.com/reynoldsalec)
|
|
48
|
+
* [@aaronfeledy](https://github.com/AaronFeledy)
|
|
46
49
|
|
|
47
50
|
## Contributors
|
|
48
51
|
|
|
@@ -58,6 +58,34 @@ const xdebugConfig = host => ([
|
|
|
58
58
|
`remote_host=${host}`,
|
|
59
59
|
].join(' '));
|
|
60
60
|
|
|
61
|
+
const detectDatabaseClient = (options, debug = () => {}) => {
|
|
62
|
+
if (options.db_client === false) return null;
|
|
63
|
+
if (options.db_client && options.db_client !== 'auto') return options.db_client;
|
|
64
|
+
|
|
65
|
+
const services = options._app?.config?.services || {};
|
|
66
|
+
let mysqlVersion = null;
|
|
67
|
+
let mariaVersion = null;
|
|
68
|
+
|
|
69
|
+
for (const service of Object.values(services)) {
|
|
70
|
+
const type = service?.type || '';
|
|
71
|
+
// Match mysql:X or recipe-mysql:X (e.g., backdrop-mysql:8.0, drupal-mysql:8.4)
|
|
72
|
+
const mysqlMatch = type.match(/(?:^|-)mysql:(\d+(?:\.\d+)?)/);
|
|
73
|
+
if (mysqlMatch && !mysqlVersion) mysqlVersion = mysqlMatch[1];
|
|
74
|
+
// Match mariadb:X or recipe-mariadb:X (e.g., backdrop-mariadb:10.6, drupal-mariadb:11.4)
|
|
75
|
+
const mariaMatch = type.match(/(?:^|-)mariadb:(\d+(?:\.\d+)?)/);
|
|
76
|
+
if (mariaMatch && !mariaVersion) mariaVersion = mariaMatch[1];
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
if (mariaVersion && mysqlVersion) {
|
|
80
|
+
debug('Both MariaDB (%s) and MySQL (%s) detected; using MariaDB. Set db_client to override.',
|
|
81
|
+
mariaVersion, mysqlVersion);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
if (mariaVersion) return `mariadb:${mariaVersion}`;
|
|
85
|
+
if (mysqlVersion) return `mysql:${mysqlVersion}`;
|
|
86
|
+
return null;
|
|
87
|
+
};
|
|
88
|
+
|
|
61
89
|
/**
|
|
62
90
|
* Helper function to build a package string by combining package name and version
|
|
63
91
|
*
|
|
@@ -126,7 +154,7 @@ module.exports = {
|
|
|
126
154
|
name: 'php',
|
|
127
155
|
config: {
|
|
128
156
|
version: '7.4',
|
|
129
|
-
supported: ['8.4', '8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
|
|
157
|
+
supported: ['8.5', '8.4', '8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
|
|
130
158
|
legacy: ['7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
|
|
131
159
|
gen2: ['5.5', '5.4', '5.3'],
|
|
132
160
|
path: [
|
|
@@ -163,8 +191,9 @@ module.exports = {
|
|
|
163
191
|
},
|
|
164
192
|
scriptsDir: path.resolve(__dirname, '..', 'scripts'),
|
|
165
193
|
sources: [],
|
|
166
|
-
suffix: '
|
|
194
|
+
suffix: '7',
|
|
167
195
|
ssl: false,
|
|
196
|
+
db_client: 'auto',
|
|
168
197
|
via: 'apache',
|
|
169
198
|
volumes: ['/usr/local/bin'],
|
|
170
199
|
webroot: '.',
|
|
@@ -231,12 +260,17 @@ module.exports = {
|
|
|
231
260
|
addBuildStep(commands, options._app, options.name, 'build_internal');
|
|
232
261
|
}
|
|
233
262
|
|
|
234
|
-
// Install the desired composer version as
|
|
263
|
+
// Install the desired composer version as a `build_as_root_internal` step so it runs
|
|
264
|
+
// before user build steps — prevents composer from being missing if build_as_root fails
|
|
235
265
|
if (options.composer_version) {
|
|
236
266
|
debug('Installing composer version %s', options.composer_version);
|
|
237
267
|
const commands = [`/etc/lando/service/helpers/install-composer.sh ${options.composer_version}`];
|
|
238
|
-
|
|
239
|
-
|
|
268
|
+
addBuildStep(commands, options._app, options.name, 'build_as_root_internal');
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
const dbClient = detectDatabaseClient(options, debug);
|
|
272
|
+
if (dbClient && phpSemver && semver.gte(phpSemver, '8.3.0')) {
|
|
273
|
+
addBuildStep([`/etc/lando/service/helpers/install-db-client.sh ${dbClient}`], options._app, options.name, 'build_as_root_internal');
|
|
240
274
|
}
|
|
241
275
|
|
|
242
276
|
// Add in nginx if we need to
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:5.6-apache-
|
|
1
|
+
# docker build -t devwithlando/php:5.6-apache-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:5.6-apache-stretch
|
|
4
4
|
|
|
5
|
-
#
|
|
5
|
+
# Debian Stretch has archived repositories and expired keys
|
|
6
6
|
RUN \
|
|
7
7
|
sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
|
|
8
8
|
&& sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
|
|
9
9
|
&& sed -i '/stretch-updates/d' /etc/apt/sources.list \
|
|
10
10
|
&& echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
|
|
11
|
-
&&
|
|
12
|
-
&& apt -y
|
|
11
|
+
&& apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
|
|
12
|
+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
|
|
13
|
+
|
|
14
|
+
# Install dependencies
|
|
15
|
+
RUN \
|
|
16
|
+
mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
17
|
+
&& apt-get update && apt-get install -y \
|
|
13
18
|
gnupg2 \
|
|
14
19
|
wget \
|
|
15
20
|
bzip2 \
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:5.6-fpm-
|
|
1
|
+
# docker build -t devwithlando/php:5.6-fpm-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:5.6-fpm-stretch
|
|
4
4
|
|
|
5
|
-
#
|
|
5
|
+
# Debian Stretch has archived repositories and expired keys
|
|
6
6
|
RUN \
|
|
7
7
|
sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
|
|
8
8
|
&& sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
|
|
9
9
|
&& sed -i '/stretch-updates/d' /etc/apt/sources.list \
|
|
10
10
|
&& echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
|
|
11
|
-
&&
|
|
12
|
-
&& apt -y
|
|
11
|
+
&& apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
|
|
12
|
+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
|
|
13
|
+
|
|
14
|
+
# Install dependencies
|
|
15
|
+
RUN \
|
|
16
|
+
mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
17
|
+
&& apt-get update && apt-get install -y \
|
|
13
18
|
gnupg2 \
|
|
14
19
|
wget \
|
|
15
20
|
bzip2 \
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:7.0-apache-
|
|
1
|
+
# docker build -t devwithlando/php:7.0-apache-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:7.0-apache-stretch
|
|
4
4
|
|
|
5
|
-
#
|
|
5
|
+
# Debian Stretch has archived repositories and expired keys
|
|
6
6
|
RUN \
|
|
7
7
|
sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
|
|
8
8
|
&& sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
|
|
9
9
|
&& sed -i '/stretch-updates/d' /etc/apt/sources.list \
|
|
10
10
|
&& echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
|
|
11
|
-
&&
|
|
12
|
-
&& apt -y
|
|
11
|
+
&& apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
|
|
12
|
+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
|
|
13
|
+
|
|
14
|
+
# Install dependencies
|
|
15
|
+
RUN \
|
|
16
|
+
mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
17
|
+
&& apt-get update && apt-get install -y \
|
|
13
18
|
gnupg2 \
|
|
14
19
|
wget \
|
|
15
20
|
bzip2 \
|
|
@@ -1,15 +1,20 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:7.0-fpm-
|
|
1
|
+
# docker build -t devwithlando/php:7.0-fpm-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:7.0-fpm-stretch
|
|
4
4
|
|
|
5
|
-
#
|
|
5
|
+
# Debian Stretch has archived repositories and expired keys
|
|
6
6
|
RUN \
|
|
7
7
|
sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
|
|
8
8
|
&& sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
|
|
9
9
|
&& sed -i '/stretch-updates/d' /etc/apt/sources.list \
|
|
10
10
|
&& echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
|
|
11
|
-
&&
|
|
12
|
-
&& apt -y
|
|
11
|
+
&& apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
|
|
12
|
+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
|
|
13
|
+
|
|
14
|
+
# Install dependencies
|
|
15
|
+
RUN \
|
|
16
|
+
mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
17
|
+
&& apt-get update && apt-get install -y \
|
|
13
18
|
gnupg2 \
|
|
14
19
|
wget \
|
|
15
20
|
bzip2 \
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:7.4-apache-
|
|
1
|
+
# docker build -t devwithlando/php:7.4-apache-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:7.4-apache-bullseye
|
|
4
4
|
|
|
@@ -8,7 +8,7 @@ RUN \
|
|
|
8
8
|
# MariaDB client compatibility (https://github.com/lando/php/issues/120)
|
|
9
9
|
mkdir -p /etc/apt/keyrings \
|
|
10
10
|
&& curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
|
|
11
|
-
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://
|
|
11
|
+
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
|
|
12
12
|
|
|
13
13
|
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
14
14
|
&& apt -y update && apt-get install -y \
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:7.4-fpm-
|
|
1
|
+
# docker build -t devwithlando/php:7.4-fpm-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:7.4-fpm-bullseye
|
|
4
4
|
|
|
@@ -8,7 +8,7 @@ RUN \
|
|
|
8
8
|
# MariaDB client compatibility (https://github.com/lando/php/issues/120)
|
|
9
9
|
mkdir -p /etc/apt/keyrings \
|
|
10
10
|
&& curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
|
|
11
|
-
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://
|
|
11
|
+
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
|
|
12
12
|
|
|
13
13
|
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
14
14
|
&& apt -y update && apt-get install -y \
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:8.0-apache-
|
|
1
|
+
# docker build -t devwithlando/php:8.0-apache-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:8.0-apache-bullseye
|
|
4
4
|
|
|
@@ -8,7 +8,7 @@ RUN \
|
|
|
8
8
|
# MariaDB client compatibility (https://github.com/lando/php/issues/120)
|
|
9
9
|
mkdir -p /etc/apt/keyrings \
|
|
10
10
|
&& curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
|
|
11
|
-
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://
|
|
11
|
+
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
|
|
12
12
|
|
|
13
13
|
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
14
14
|
&& apt -y update && apt-get install -y \
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# docker build -t devwithlando/php:8.0-fpm-
|
|
1
|
+
# docker build -t devwithlando/php:8.0-fpm-7 .
|
|
2
2
|
|
|
3
3
|
FROM php:8.0-fpm-bullseye
|
|
4
4
|
|
|
@@ -8,7 +8,7 @@ RUN \
|
|
|
8
8
|
# MariaDB client compatibility (https://github.com/lando/php/issues/120)
|
|
9
9
|
mkdir -p /etc/apt/keyrings \
|
|
10
10
|
&& curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
|
|
11
|
-
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://
|
|
11
|
+
&& echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
|
|
12
12
|
|
|
13
13
|
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
14
14
|
&& apt -y update && apt-get install -y \
|