@lando/php 0.10.2 → 1.1.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/.lando.yml +3 -3
- package/.nyc_output/processinfo/1b6c4377-66a5-4dca-afdc-fa5f97f36a12.json +1 -0
- package/.nyc_output/processinfo/7664c8a2-ef06-4ff0-ae4b-44779265c9dd.json +1 -0
- package/.nyc_output/processinfo/index.json +1 -1
- package/CHANGELOG.md +6 -0
- package/builders/php.js +2 -2
- package/coverage/index.html +1 -1
- package/images/8.3-apache/Dockerfile +85 -0
- package/images/8.3-fpm/Dockerfile +86 -0
- package/netlify.toml +1 -1
- package/node_modules/@lando/nginx/.nyc_output/processinfo/68963536-315a-41b5-9dda-1c3f30fb9c99.json +1 -0
- package/node_modules/@lando/nginx/.nyc_output/processinfo/e965c931-7444-4e4e-8bc1-c51f696e4cfe.json +1 -0
- package/node_modules/@lando/nginx/.nyc_output/processinfo/index.json +1 -1
- package/node_modules/@lando/nginx/CHANGELOG.md +22 -15
- package/node_modules/@lando/nginx/builders/nginx.js +6 -11
- package/node_modules/@lando/nginx/config/launch.sh +3 -12
- package/node_modules/@lando/nginx/coverage/index.html +1 -1
- package/node_modules/@lando/nginx/package.json +1 -1
- package/package.json +17 -11
- package/.nyc_output/processinfo/41cf4733-5fd1-4901-8efe-1d8147fe6dfd.json +0 -1
- package/.nyc_output/processinfo/ad2f5569-33d5-49eb-a1cf-96c429e575e8.json +0 -1
- package/node_modules/@lando/nginx/.nyc_output/processinfo/25008f82-06ee-4bbc-8343-1d528da4b82d.json +0 -1
- package/node_modules/@lando/nginx/.nyc_output/processinfo/6426f44d-f78d-4e10-9b15-d18497ce3d61.json +0 -1
- /package/.nyc_output/{41cf4733-5fd1-4901-8efe-1d8147fe6dfd.json → 1b6c4377-66a5-4dca-afdc-fa5f97f36a12.json} +0 -0
- /package/.nyc_output/{ad2f5569-33d5-49eb-a1cf-96c429e575e8.json → 7664c8a2-ef06-4ff0-ae4b-44779265c9dd.json} +0 -0
- /package/node_modules/@lando/nginx/.nyc_output/{25008f82-06ee-4bbc-8343-1d528da4b82d.json → 68963536-315a-41b5-9dda-1c3f30fb9c99.json} +0 -0
- /package/node_modules/@lando/nginx/.nyc_output/{6426f44d-f78d-4e10-9b15-d18497ce3d61.json → e965c931-7444-4e4e-8bc1-c51f696e4cfe.json} +0 -0
- /package/node_modules/{lru-cache → semver/node_modules/lru-cache}/LICENSE +0 -0
- /package/node_modules/{lru-cache → semver/node_modules/lru-cache}/README.md +0 -0
- /package/node_modules/{lru-cache → semver/node_modules/lru-cache}/index.js +0 -0
- /package/node_modules/{lru-cache → semver/node_modules/lru-cache}/package.json +0 -0
- /package/node_modules/{yallist → semver/node_modules/yallist}/LICENSE +0 -0
- /package/node_modules/{yallist → semver/node_modules/yallist}/README.md +0 -0
- /package/node_modules/{yallist → semver/node_modules/yallist}/iterator.js +0 -0
- /package/node_modules/{yallist → semver/node_modules/yallist}/package.json +0 -0
- /package/node_modules/{yallist → semver/node_modules/yallist}/yallist.js +0 -0
package/.lando.yml
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"parent":null,"pid":1888,"argv":["/opt/hostedtoolcache/node/18.19.0/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1706558839904,"ppid":1887,"coverageFilename":"/home/runner/work/php/php/.nyc_output/1b6c4377-66a5-4dca-afdc-fa5f97f36a12.json","externalId":"","uuid":"1b6c4377-66a5-4dca-afdc-fa5f97f36a12","files":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"parent":null,"pid":1899,"argv":["/opt/hostedtoolcache/node/18.19.0/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1706558840114,"ppid":1888,"coverageFilename":"/home/runner/work/php/php/.nyc_output/7664c8a2-ef06-4ff0-ae4b-44779265c9dd.json","externalId":"","uuid":"7664c8a2-ef06-4ff0-ae4b-44779265c9dd","files":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"processes":{"
|
|
1
|
+
{"processes":{"1b6c4377-66a5-4dca-afdc-fa5f97f36a12":{"parent":null,"children":[]},"7664c8a2-ef06-4ff0-ae4b-44779265c9dd":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## v1.1.0 - [January 29, 2024](https://github.com/lando/php/releases/tag/v1.1.0)
|
|
2
|
+
* Add support for PHP 8.3. [#77](https://github.com/lando/php/issues/77)
|
|
3
|
+
|
|
4
|
+
## v1.0.0 - [December 7, 2023](https://github.com/lando/php/releases/tag/v1.0.0)
|
|
5
|
+
* Dialed fully for `lando update`
|
|
6
|
+
|
|
1
7
|
## v0.10.2 - [November 28, 2023](https://github.com/lando/php/releases/tag/v0.10.2)
|
|
2
8
|
* Added option to override the image powering the service.
|
|
3
9
|
* Removed apparmor step from image building.
|
package/builders/php.js
CHANGED
|
@@ -91,7 +91,7 @@ module.exports = {
|
|
|
91
91
|
name: 'php',
|
|
92
92
|
config: {
|
|
93
93
|
version: '7.4',
|
|
94
|
-
supported: ['8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
|
|
94
|
+
supported: ['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'],
|
|
95
95
|
legacy: ['7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
|
|
96
96
|
gen2: ['5.5', '5.4', '5.3'],
|
|
97
97
|
gen3: ['7.2', '7.1', '7.0', '5.6'],
|
|
@@ -109,7 +109,7 @@ module.exports = {
|
|
|
109
109
|
],
|
|
110
110
|
confSrc: path.resolve(__dirname, '..', 'config'),
|
|
111
111
|
command: ['sh -c \'a2enmod rewrite && apache2-foreground\''],
|
|
112
|
-
composer_version: '2.2.
|
|
112
|
+
composer_version: '2.2.22',
|
|
113
113
|
phpServer: 'apache',
|
|
114
114
|
defaultFiles: {
|
|
115
115
|
_php: 'php.ini',
|
package/coverage/index.html
CHANGED
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
87
87
|
Code coverage generated by
|
|
88
88
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
89
|
-
at
|
|
89
|
+
at 2024-01-29T20:07:20.315Z
|
|
90
90
|
</div>
|
|
91
91
|
<script src="prettify.js"></script>
|
|
92
92
|
<script>
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
# docker build -t devwithlando/php:8.3-apache-4 .
|
|
2
|
+
|
|
3
|
+
FROM php:8.3-apache-bullseye
|
|
4
|
+
|
|
5
|
+
# Install dependencies we need
|
|
6
|
+
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
7
|
+
&& apt -y update && apt-get install -y \
|
|
8
|
+
gnupg2 \
|
|
9
|
+
wget \
|
|
10
|
+
&& echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
|
|
11
|
+
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
|
|
12
|
+
&& apt-get update && apt-get install -y \
|
|
13
|
+
bzip2 \
|
|
14
|
+
default-mysql-client \
|
|
15
|
+
exiftool \
|
|
16
|
+
git-core \
|
|
17
|
+
imagemagick \
|
|
18
|
+
libbz2-dev \
|
|
19
|
+
libc-client-dev \
|
|
20
|
+
libfreetype6-dev \
|
|
21
|
+
libicu-dev \
|
|
22
|
+
libjpeg62-turbo-dev \
|
|
23
|
+
libkrb5-dev \
|
|
24
|
+
libldap2-dev \
|
|
25
|
+
libmagickwand-dev \
|
|
26
|
+
libmemcached-dev \
|
|
27
|
+
libpng-dev \
|
|
28
|
+
libpq-dev \
|
|
29
|
+
libssl-dev \
|
|
30
|
+
libwebp-dev \
|
|
31
|
+
libxml2-dev \
|
|
32
|
+
libzip-dev \
|
|
33
|
+
libonig-dev \
|
|
34
|
+
openssl \
|
|
35
|
+
postgresql-client-10 \
|
|
36
|
+
pv \
|
|
37
|
+
rsync \
|
|
38
|
+
ssh \
|
|
39
|
+
unzip \
|
|
40
|
+
wget \
|
|
41
|
+
xfonts-75dpi \
|
|
42
|
+
xfonts-base \
|
|
43
|
+
zlib1g-dev \
|
|
44
|
+
&& pecl install apcu \
|
|
45
|
+
&& pecl install imagick \
|
|
46
|
+
&& pecl install memcached \
|
|
47
|
+
&& pecl install oauth \
|
|
48
|
+
&& pecl install redis-6.0.2 \
|
|
49
|
+
&& pecl install xdebug-3.3.0alpha3 \
|
|
50
|
+
&& docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \
|
|
51
|
+
&& docker-php-ext-enable apcu \
|
|
52
|
+
&& docker-php-ext-enable imagick \
|
|
53
|
+
&& docker-php-ext-enable memcached \
|
|
54
|
+
&& docker-php-ext-enable oauth \
|
|
55
|
+
&& docker-php-ext-enable redis \
|
|
56
|
+
&& docker-php-ext-install bcmath \
|
|
57
|
+
&& docker-php-ext-install bz2 \
|
|
58
|
+
&& docker-php-ext-install calendar \
|
|
59
|
+
&& docker-php-ext-install exif \
|
|
60
|
+
&& docker-php-ext-install gettext \
|
|
61
|
+
&& docker-php-ext-install intl \
|
|
62
|
+
&& docker-php-ext-install ldap \
|
|
63
|
+
&& docker-php-ext-install mbstring \
|
|
64
|
+
&& docker-php-ext-install mysqli \
|
|
65
|
+
&& docker-php-ext-install opcache \
|
|
66
|
+
&& docker-php-ext-install pcntl \
|
|
67
|
+
&& docker-php-ext-install pdo \
|
|
68
|
+
&& docker-php-ext-install pdo_mysql \
|
|
69
|
+
&& docker-php-ext-install pdo_pgsql \
|
|
70
|
+
&& docker-php-ext-install soap \
|
|
71
|
+
&& docker-php-ext-install zip \
|
|
72
|
+
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
|
|
73
|
+
&& php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.22 \
|
|
74
|
+
&& php -r "unlink('composer-setup.php');" \
|
|
75
|
+
&& chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
|
|
76
|
+
&& apt-get -y clean \
|
|
77
|
+
&& apt-get -y autoclean \
|
|
78
|
+
&& apt-get -y autoremove \
|
|
79
|
+
&& rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \
|
|
80
|
+
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
|
|
81
|
+
&& docker-php-ext-install imap \
|
|
82
|
+
&& docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \
|
|
83
|
+
&& docker-php-ext-install gd
|
|
84
|
+
|
|
85
|
+
RUN curl https://dl.yarnpkg.com
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
# docker build -t devwithlando/php:8.3-fpm-4 .
|
|
2
|
+
|
|
3
|
+
FROM php:8.3-fpm-bullseye
|
|
4
|
+
|
|
5
|
+
# Install dependencies we need
|
|
6
|
+
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
|
|
7
|
+
&& apt -y update && apt-get install -y \
|
|
8
|
+
gnupg2 \
|
|
9
|
+
wget \
|
|
10
|
+
&& echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' >> /etc/apt/sources.list.d/pgdg.list \
|
|
11
|
+
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
|
|
12
|
+
&& apt-get update && apt-get install -y \
|
|
13
|
+
bzip2 \
|
|
14
|
+
default-mysql-client \
|
|
15
|
+
exiftool \
|
|
16
|
+
git-core \
|
|
17
|
+
imagemagick \
|
|
18
|
+
libbz2-dev \
|
|
19
|
+
libc-client-dev \
|
|
20
|
+
libfreetype6-dev \
|
|
21
|
+
libicu-dev \
|
|
22
|
+
libjpeg62-turbo-dev \
|
|
23
|
+
libkrb5-dev \
|
|
24
|
+
libldap2-dev \
|
|
25
|
+
libmagickwand-dev \
|
|
26
|
+
libmemcached-dev \
|
|
27
|
+
libpng-dev \
|
|
28
|
+
libpq-dev \
|
|
29
|
+
libssl-dev \
|
|
30
|
+
libwebp-dev \
|
|
31
|
+
libxml2-dev \
|
|
32
|
+
libzip-dev \
|
|
33
|
+
libonig-dev \
|
|
34
|
+
openssl \
|
|
35
|
+
postgresql-client-10 \
|
|
36
|
+
pv \
|
|
37
|
+
rsync \
|
|
38
|
+
ssh \
|
|
39
|
+
unzip \
|
|
40
|
+
wget \
|
|
41
|
+
xfonts-75dpi \
|
|
42
|
+
xfonts-base \
|
|
43
|
+
zlib1g-dev \
|
|
44
|
+
&& pecl install apcu \
|
|
45
|
+
&& pecl install imagick \
|
|
46
|
+
&& pecl install memcached \
|
|
47
|
+
&& pecl install oauth \
|
|
48
|
+
&& pecl install redis-6.0.2 \
|
|
49
|
+
&& pecl install xdebug-3.3.0alpha3 \
|
|
50
|
+
&& docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \
|
|
51
|
+
&& docker-php-ext-enable apcu \
|
|
52
|
+
&& docker-php-ext-enable imagick \
|
|
53
|
+
&& docker-php-ext-enable memcached \
|
|
54
|
+
&& docker-php-ext-enable oauth \
|
|
55
|
+
&& docker-php-ext-enable redis \
|
|
56
|
+
&& docker-php-ext-install bcmath \
|
|
57
|
+
&& docker-php-ext-install bz2 \
|
|
58
|
+
&& docker-php-ext-install calendar \
|
|
59
|
+
&& docker-php-ext-install exif \
|
|
60
|
+
&& docker-php-ext-install gettext \
|
|
61
|
+
&& docker-php-ext-install intl \
|
|
62
|
+
&& docker-php-ext-install ldap \
|
|
63
|
+
&& docker-php-ext-install mbstring \
|
|
64
|
+
&& docker-php-ext-install mysqli \
|
|
65
|
+
&& docker-php-ext-install opcache \
|
|
66
|
+
&& docker-php-ext-install pcntl \
|
|
67
|
+
&& docker-php-ext-install pdo \
|
|
68
|
+
&& docker-php-ext-install pdo_mysql \
|
|
69
|
+
&& docker-php-ext-install pdo_pgsql \
|
|
70
|
+
&& docker-php-ext-install soap \
|
|
71
|
+
&& docker-php-ext-install zip \
|
|
72
|
+
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
|
|
73
|
+
&& php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.22 \
|
|
74
|
+
&& php -r "unlink('composer-setup.php');" \
|
|
75
|
+
&& chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
|
|
76
|
+
&& apt-get -y clean \
|
|
77
|
+
&& apt-get -y autoclean \
|
|
78
|
+
&& apt-get -y autoremove \
|
|
79
|
+
&& rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/* \
|
|
80
|
+
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
|
|
81
|
+
&& docker-php-ext-install imap \
|
|
82
|
+
&& docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype \
|
|
83
|
+
&& docker-php-ext-install gd
|
|
84
|
+
|
|
85
|
+
# Tests
|
|
86
|
+
RUN curl https://dl.yarnpkg.com
|
package/netlify.toml
CHANGED
package/node_modules/@lando/nginx/.nyc_output/processinfo/68963536-315a-41b5-9dda-1c3f30fb9c99.json
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"parent":null,"pid":2001,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1701812496779,"ppid":2000,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/68963536-315a-41b5-9dda-1c3f30fb9c99.json","externalId":"","uuid":"68963536-315a-41b5-9dda-1c3f30fb9c99","files":[]}
|
package/node_modules/@lando/nginx/.nyc_output/processinfo/e965c931-7444-4e4e-8bc1-c51f696e4cfe.json
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"parent":null,"pid":2012,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1701812496927,"ppid":2001,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/e965c931-7444-4e4e-8bc1-c51f696e4cfe.json","externalId":"","uuid":"e965c931-7444-4e4e-8bc1-c51f696e4cfe","files":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"processes":{"
|
|
1
|
+
{"processes":{"68963536-315a-41b5-9dda-1c3f30fb9c99":{"parent":null,"children":[]},"e965c931-7444-4e4e-8bc1-c51f696e4cfe":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
|
|
@@ -1,30 +1,37 @@
|
|
|
1
|
+
## v0.11.0 - [December 5, 2023](https://github.com/lando/nginx/releases/tag/v0.11.0)
|
|
2
|
+
|
|
3
|
+
* Got rid of render-template tooling. [#33](https://github.com/lando/nginx/pull/33)
|
|
4
|
+
* Added support for `nginx:1.25`.
|
|
5
|
+
|
|
1
6
|
## v0.10.0 - [November 15, 2023](https://github.com/lando/nginx/releases/tag/v0.10.0)
|
|
2
|
-
|
|
3
|
-
*
|
|
7
|
+
|
|
8
|
+
* Moved builder file to the new builders/ directory.
|
|
9
|
+
* Isolated testing to fit with HARDCORE strategy.
|
|
4
10
|
|
|
5
11
|
## v0.9.0 - [July 3, 2023](https://github.com/lando/nginx/releases/tag/v0.9.0)
|
|
6
|
-
|
|
7
|
-
*
|
|
8
|
-
* Updated
|
|
12
|
+
|
|
13
|
+
* Removed bundle-dependencies and version-bump-prompt from plugin.
|
|
14
|
+
* Updated package to use prepare-release-action.
|
|
15
|
+
* Updated documentation to reflect new release process.
|
|
9
16
|
|
|
10
17
|
## v0.8.0 - [May 10, 2023](https://github.com/lando/nginx/releases/tag/v0.8.0)
|
|
11
18
|
|
|
12
|
-
* Added support for `nginx:1.19`
|
|
13
|
-
* Added support for `nginx:1.20`
|
|
14
|
-
* Added support for `nginx:1.21`
|
|
15
|
-
* Added support for `nginx:1.22`
|
|
16
|
-
* Added support for `nginx:1.23`
|
|
17
|
-
* Added support for `nginx:1.24`
|
|
19
|
+
* Added support for `nginx:1.19`
|
|
20
|
+
* Added support for `nginx:1.20`
|
|
21
|
+
* Added support for `nginx:1.21`
|
|
22
|
+
* Added support for `nginx:1.22`
|
|
23
|
+
* Added support for `nginx:1.23`
|
|
24
|
+
* Added support for `nginx:1.24`
|
|
18
25
|
|
|
19
26
|
## v0.7.0 - [December 12, 2022](https://github.com/lando/nginx/releases/tag/v0.7.0)
|
|
20
27
|
|
|
21
|
-
* Added bundle-dependencies to release process.
|
|
22
|
-
* Fixed bug in plugin dogfooding test.
|
|
28
|
+
* Added bundle-dependencies to release process.
|
|
29
|
+
* Fixed bug in plugin dogfooding test.
|
|
23
30
|
|
|
24
31
|
## v0.6.0 - [September 7, 2022](https://github.com/lando/nginx/releases/tag/v0.6.0)
|
|
25
32
|
|
|
26
33
|
## v0.5.0 - [November 9, 2021](https://github.com/lando/nginx/releases/tag/v0.5.0)
|
|
27
34
|
|
|
28
|
-
Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).
|
|
35
|
+
Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).
|
|
29
36
|
|
|
30
|
-
* Initial Release
|
|
37
|
+
* Initial Release
|
|
@@ -9,12 +9,13 @@ module.exports = {
|
|
|
9
9
|
name: 'nginx',
|
|
10
10
|
config: {
|
|
11
11
|
version: '1.17',
|
|
12
|
-
supported: ['1.14', '1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24'],
|
|
12
|
+
supported: ['1.14', '1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '1.22', '1.23', '1.24', '1.25'],
|
|
13
13
|
legacy: ['1.14'],
|
|
14
14
|
pinPairs: {
|
|
15
|
-
'1.
|
|
16
|
-
'1.
|
|
17
|
-
'1.
|
|
15
|
+
'1.25': 'bitnami/nginx:1.25.3-debian-11-r1',
|
|
16
|
+
'1.24': 'bitnami/nginx:1.24.0-debian-11-r153',
|
|
17
|
+
'1.23': 'bitnami/nginx:1.23.4-debian-11-r24',
|
|
18
|
+
'1.22': 'bitnami/nginx:1.22.1-debian-11-r66',
|
|
18
19
|
'1.21': 'bitnami/nginx:1.21.6-debian-11-r21',
|
|
19
20
|
'1.20': 'bitnami/nginx:1.20.2-debian-11-r9',
|
|
20
21
|
'1.19': 'bitnami/nginx:1.19.10-debian-10-r94',
|
|
@@ -42,7 +43,6 @@ module.exports = {
|
|
|
42
43
|
},
|
|
43
44
|
ssl: false,
|
|
44
45
|
webroot: '.',
|
|
45
|
-
renderTemplate: '1.0.5-5',
|
|
46
46
|
},
|
|
47
47
|
parent: '_webserver',
|
|
48
48
|
builder: (parent, config) => class LandoNginx extends parent {
|
|
@@ -64,11 +64,6 @@ module.exports = {
|
|
|
64
64
|
options.defaultFiles = _.merge({}, options.defaultFiles, {server: 'nginx.conf.tpl'});
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
// swap to older render template as needed
|
|
68
|
-
if (mv === '1.14' || mv === '1.15' || mv === '1.16') {
|
|
69
|
-
options.renderTemplate = '1.0.0-3';
|
|
70
|
-
}
|
|
71
|
-
|
|
72
67
|
// Get the config files final destination
|
|
73
68
|
// @TODO: we cp the files instead of directly mounting them to
|
|
74
69
|
// prevent unexpected edits to this files
|
|
@@ -78,7 +73,7 @@ module.exports = {
|
|
|
78
73
|
// Build the default stuff here
|
|
79
74
|
const nginx = {
|
|
80
75
|
image: `bitnami/nginx:${options.version}`,
|
|
81
|
-
command: `/launch.sh ${vhosts} ${server} ${params}
|
|
76
|
+
command: `/launch.sh ${vhosts} ${server} ${params}`,
|
|
82
77
|
environment: {
|
|
83
78
|
NGINX_HTTP_PORT_NUMBER: '80',
|
|
84
79
|
NGINX_DAEMON_USER: 'root',
|
|
@@ -7,7 +7,6 @@ set -e
|
|
|
7
7
|
: ${VHOST:="$1"}
|
|
8
8
|
: ${SERVER:="$2"}
|
|
9
9
|
: ${PARAMS:="$3"}
|
|
10
|
-
: ${RENDER_TEMPLATE:="$4"}
|
|
11
10
|
: ${VHOST_SOURCE:="/tmp/vhosts.conf.lando"}
|
|
12
11
|
: ${SERVER_SOURCE:="/tmp/server.conf.lando"}
|
|
13
12
|
: ${PARAMS_SOURCE:="/tmp/fastcgi_params.lando"}
|
|
@@ -35,18 +34,10 @@ if [ -f "$PARAMS_SOURCE" ]; then
|
|
|
35
34
|
cp -f "$PARAMS_SOURCE" "$PARAMS"
|
|
36
35
|
fi
|
|
37
36
|
|
|
38
|
-
#
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
fi
|
|
37
|
+
# Replace LANDO_WEBROOT in the vhost template
|
|
38
|
+
lando_info "Using sed to place correct webroot in vhost template"
|
|
39
|
+
sed 's@{{LANDO_WEBROOT}}@'"${LANDO_WEBROOT}"'@g' "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
|
|
42
40
|
|
|
43
|
-
# Render the template if render-template exists
|
|
44
|
-
if [ -x "$(command -v render-template)" ]; then
|
|
45
|
-
render-template "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
|
|
46
|
-
else
|
|
47
|
-
lando_info "Command render-template not found, using sed"
|
|
48
|
-
sed 's@{{LANDO_WEBROOT}}@'"${LANDO_WEBROOT}"'@g' "$VHOST_SOURCE" > /opt/bitnami/nginx/conf/vhosts/lando.conf
|
|
49
|
-
fi
|
|
50
41
|
lando_info "Rendered template /tmp/vhosts.lando to /opt/bitnami/nginx/conf/vhosts/lando.conf"
|
|
51
42
|
lando_debug $(cat /opt/bitnami/nginx/conf/vhosts/lando.conf)
|
|
52
43
|
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
87
87
|
Code coverage generated by
|
|
88
88
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
89
|
-
at 2023-
|
|
89
|
+
at 2023-12-05T21:41:37.121Z
|
|
90
90
|
</div>
|
|
91
91
|
<script src="prettify.js"></script>
|
|
92
92
|
<script>
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lando/php",
|
|
3
3
|
"description": "A Lando plugin that provides a tight integration with PHP.",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "1.1.0",
|
|
5
5
|
"author": "Mike Pirog @pirog",
|
|
6
6
|
"license": "GPL-3.0",
|
|
7
7
|
"repository": "lando/php",
|
|
@@ -14,13 +14,8 @@
|
|
|
14
14
|
"php"
|
|
15
15
|
],
|
|
16
16
|
"engines": {
|
|
17
|
-
"node": ">=
|
|
17
|
+
"node": ">=18.0.0"
|
|
18
18
|
},
|
|
19
|
-
"bundledDependencies": [
|
|
20
|
-
"@lando/nginx",
|
|
21
|
-
"lodash",
|
|
22
|
-
"semver"
|
|
23
|
-
],
|
|
24
19
|
"lando": {},
|
|
25
20
|
"main": "index.js",
|
|
26
21
|
"nyc": {
|
|
@@ -41,13 +36,13 @@
|
|
|
41
36
|
"docs:dev": "vuepress dev docs --clean-cache --clean-temp",
|
|
42
37
|
"docs:build": "vuepress build docs",
|
|
43
38
|
"docs:lint": "eslint -c docs/.eslintrc.json --quiet docs/.vuepress",
|
|
44
|
-
"lint": "eslint --quiet . &&
|
|
39
|
+
"lint": "eslint --quiet . && npm run docs:lint",
|
|
45
40
|
"test:unit": "nyc --reporter=html --reporter=text mocha --timeout 5000 test/**/*.spec.js",
|
|
46
|
-
"test:leia": "
|
|
47
|
-
"test": "
|
|
41
|
+
"test:leia": "npm run leia \"examples/**/README.md\" -c 'Destroy tests' --stdin",
|
|
42
|
+
"test": "npm run lint && npm run test:unit"
|
|
48
43
|
},
|
|
49
44
|
"dependencies": {
|
|
50
|
-
"@lando/nginx": "0.
|
|
45
|
+
"@lando/nginx": "0.11.0",
|
|
51
46
|
"lodash": "^4.17.21",
|
|
52
47
|
"semver": "^7.3.7"
|
|
53
48
|
},
|
|
@@ -63,5 +58,16 @@
|
|
|
63
58
|
"mocha": "^9.1.2",
|
|
64
59
|
"nyc": "^15.1.0",
|
|
65
60
|
"vuepress": "2.0.0-beta.53"
|
|
61
|
+
},
|
|
62
|
+
"bundledDependencies": [
|
|
63
|
+
"@lando/nginx",
|
|
64
|
+
"lodash",
|
|
65
|
+
"semver"
|
|
66
|
+
],
|
|
67
|
+
"dist": {
|
|
68
|
+
"integrity": "sha512-DcxBjMuaigwvLIj9Y7UQbvt907jcdQTBl9uzQw4DS2ugz4ioGsb61Cr7bT+5j35ZQKVkDIrVAmRA0BJaCI+VSQ==",
|
|
69
|
+
"shasum": "f7848c79bade25faedbc5a89b362e1d9ef96e008",
|
|
70
|
+
"filename": "lando-php-1.1.0.tgz",
|
|
71
|
+
"unpackedSize": 3237983
|
|
66
72
|
}
|
|
67
73
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"parent":null,"pid":2031,"argv":["/opt/hostedtoolcache/node/18.18.2/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1701231814306,"ppid":2020,"coverageFilename":"/home/runner/work/php/php/.nyc_output/41cf4733-5fd1-4901-8efe-1d8147fe6dfd.json","externalId":"","uuid":"41cf4733-5fd1-4901-8efe-1d8147fe6dfd","files":[]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"parent":null,"pid":2020,"argv":["/opt/hostedtoolcache/node/18.18.2/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1701231814117,"ppid":2019,"coverageFilename":"/home/runner/work/php/php/.nyc_output/ad2f5569-33d5-49eb-a1cf-96c429e575e8.json","externalId":"","uuid":"ad2f5569-33d5-49eb-a1cf-96c429e575e8","files":[]}
|
package/node_modules/@lando/nginx/.nyc_output/processinfo/25008f82-06ee-4bbc-8343-1d528da4b82d.json
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"parent":null,"pid":2030,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1700078683137,"ppid":2019,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/25008f82-06ee-4bbc-8343-1d528da4b82d.json","externalId":"","uuid":"25008f82-06ee-4bbc-8343-1d528da4b82d","files":[]}
|
package/node_modules/@lando/nginx/.nyc_output/processinfo/6426f44d-f78d-4e10-9b15-d18497ce3d61.json
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"parent":null,"pid":2019,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1700078682991,"ppid":2018,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/6426f44d-f78d-4e10-9b15-d18497ce3d61.json","externalId":"","uuid":"6426f44d-f78d-4e10-9b15-d18497ce3d61","files":[]}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|