@fishawack/lab-env 5.2.0-beta.1 → 5.2.0-beta.2

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.
Files changed (15) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/adonis/0/docker-compose.yml +2 -0
  3. package/adonis/0/nginx/CHANGELOG.md +3 -0
  4. package/adonis/0/nginx/nginx.conf +5 -1
  5. package/adonis/0/nginx/package.json +1 -1
  6. package/bitbucket-pipelines.yml +1 -1
  7. package/cli.js +1 -1
  8. package/commands/test.js +11 -11
  9. package/laravel/10/docker-compose.yml +2 -0
  10. package/laravel/8/docker-compose.yml +2 -0
  11. package/laravel/8/nginx/CHANGELOG.md +3 -0
  12. package/laravel/8/nginx/nginx.conf +5 -1
  13. package/laravel/8/nginx/package.json +1 -1
  14. package/laravel/9/docker-compose.yml +2 -0
  15. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  ## Changelog
2
2
 
3
+ ### 5.2.0-beta.2 (2026-01-17)
4
+
5
+ #### Bug Fixes
6
+
7
+ * make nginx depend on web server to stop race condition errors ([16f6b11](https://bitbucket.org/fishawackdigital/lab-env/commits/16f6b11592107bcbdd1d2dc5e32cc4312b1e2909))
8
+ * nginx now resolves on request rather than start time to avoid race conditions ([7cb6356](https://bitbucket.org/fishawackdigital/lab-env/commits/7cb6356b5628534aa6487178e1cc988e645b0771))
9
+ * python now has access to webDev commands like install and runs npm test ([44c2cf3](https://bitbucket.org/fishawackdigital/lab-env/commits/44c2cf3d7287ad1c34e87917334a95d565793ab4))
10
+
11
+ #### Build Updates
12
+
13
+ * bumped fishawack/lab-env-adonis-0-nginx to 1.0.1 ([337f993](https://bitbucket.org/fishawackdigital/lab-env/commits/337f993c4eac2d1a253c38c87f20d50577d66959))
14
+ * bumped fishawack/lab-env-laravel-8-nginx to 0.1.3 ([5aa1a0e](https://bitbucket.org/fishawackdigital/lab-env/commits/5aa1a0e032319ba1f68117734bbb3ea6a6920148))
15
+ * login to docker before tests ([ee005ff](https://bitbucket.org/fishawackdigital/lab-env/commits/ee005ff06a146ef1060dc8a24ace80e2b94691f5))
16
+
3
17
  ### 5.2.0-beta.1 (2026-01-14)
4
18
 
5
19
  #### Features
package/adonis/0/docker-compose.yml CHANGED
@@ -23,6 +23,8 @@ services:
23
23
  - $CWD/:/app
24
24
  ports:
25
25
  - "${PORT_WEB:-8000}:80"
26
+ depends_on:
27
+ - node
26
28
  node:
27
29
  build:
28
30
  context: $FW_ADONIS_0_NODE_CONTEXT
package/adonis/0/nginx/CHANGELOG.md CHANGED
@@ -1,4 +1,7 @@
1
1
  ## Changelog
2
2
 
3
+ ### 0.1.3 (2025-01-17)
4
+ * [fix] nginx now resolves on request rather than start time to avoid race conditions
5
+
3
6
  ### 1.0.0 (2024-06-04)
4
7
  * [misc] initial release
package/adonis/0/nginx/nginx.conf CHANGED
@@ -2,8 +2,12 @@ server {
2
2
  listen 80;
3
3
  listen [::]:80;
4
4
 
5
+ # Docker embedded DNS
6
+ resolver 127.0.0.11 ipv6=off valid=10s;
7
+
5
8
  location / {
6
- proxy_pass http://node:3333;
9
+ set $upstream node:3333;
10
+ proxy_pass http://$upstream;
7
11
  proxy_http_version 1.1;
8
12
  proxy_set_header Upgrade $http_upgrade;
9
13
  proxy_set_header Connection 'upgrade';
package/adonis/0/nginx/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nginx",
3
- "version": "1.0.0",
3
+ "version": "1.0.1",
4
4
  "description": "lab-env docker config for the nginx module",
5
5
  "scripts": {
6
6
  "preversion": "docker login",
package/bitbucket-pipelines.yml CHANGED
@@ -41,7 +41,7 @@ pipelines:
41
41
  # Install
42
42
  - su aws-runner -c 'npm run setup'
43
43
  # Test
44
- - su aws-runner -c 'npm test'
44
+ - su aws-runner -c 'docker login $DOCKER_CREDENTIALS && npm test'
45
45
  services:
46
46
  - docker
47
47
  branches:
package/cli.js CHANGED
@@ -95,7 +95,7 @@ const args = hideBin(process.argv);
95
95
  adonis: ["base", "webDev"],
96
96
  php: ["base", "webDev"],
97
97
  core: ["base", "webDev"],
98
- python: ["base"], // Python only gets base commands, no webDev
98
+ python: ["base", "webDev"], // Python only gets base commands, no webDev
99
99
  };
100
100
 
101
101
  // Config-based command additions
package/commands/test.js CHANGED
@@ -6,21 +6,21 @@ module.exports = [
6
6
  () => {},
7
7
  () => {
8
8
  _.up(() => {
9
+ _.command(
10
+ "core",
11
+ `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run test`,
12
+ );
13
+
9
14
  if (_.platform === "python") {
10
15
  _.command("python", `uv run pytest -o log_cli=true`);
11
- } else {
12
- _.command(
13
- "core",
14
- `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run test`,
15
- );
16
+ }
16
17
 
17
- if (_.platform === "laravel") {
18
- _.command("php", `php artisan test`);
19
- }
18
+ if (_.platform === "laravel") {
19
+ _.command("php", `php artisan test`);
20
+ }
20
21
 
21
- if (_.platform === "adonis") {
22
- _.command("node", `node ace test`);
23
- }
22
+ if (_.platform === "adonis") {
23
+ _.command("node", `node ace test`);
24
24
  }
25
25
  });
26
26
  },
package/laravel/10/docker-compose.yml CHANGED
@@ -23,6 +23,8 @@ services:
23
23
  - $CWD/:/app
24
24
  ports:
25
25
  - "${PORT_WEB:-8000}:80"
26
+ depends_on:
27
+ - php
26
28
  php:
27
29
  build:
28
30
  context: $FW_LARAVEL_10_PHP_CONTEXT
package/laravel/8/docker-compose.yml CHANGED
@@ -24,6 +24,8 @@ services:
24
24
  - $CWD/:/app
25
25
  ports:
26
26
  - "${PORT_WEB:-8000}:80"
27
+ depends_on:
28
+ - php
27
29
  php:
28
30
  build:
29
31
  context: $DIRNAME/laravel/8/php/
package/laravel/8/nginx/CHANGELOG.md CHANGED
@@ -1,4 +1,7 @@
1
1
  ## Changelog
2
2
 
3
+ ### 0.1.3 (2025-01-17)
4
+ * [fix] nginx now resolves on request rather than start time to avoid race conditions
5
+
3
6
  ### 0.1.2 (2023-03-02)
4
7
  * [fix] nginx now sets upload limit to 500Mb
package/laravel/8/nginx/nginx.conf CHANGED
@@ -13,6 +13,9 @@ server {
13
13
 
14
14
  charset utf-8;
15
15
 
16
+ # Docker embedded DNS
17
+ resolver 127.0.0.11 ipv6=off valid=10s;
18
+
16
19
  location / {
17
20
  try_files $uri $uri/ /index.php?$query_string;
18
21
  }
@@ -23,7 +26,8 @@ server {
23
26
  error_page 404 /index.php;
24
27
 
25
28
  location ~ \.php$ {
26
- fastcgi_pass php:9000;
29
+ set $upstream php:9000;
30
+ fastcgi_pass $upstream;
27
31
  include fastcgi_params;
28
32
  fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
29
33
  fastcgi_param SCRIPT_NAME $fastcgi_script_name;
package/laravel/8/nginx/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nginx",
3
- "version": "0.1.2",
3
+ "version": "0.1.3",
4
4
  "description": "lab-env docker config for the nginx module",
5
5
  "scripts": {
6
6
  "preversion": "docker login",
package/laravel/9/docker-compose.yml CHANGED
@@ -23,6 +23,8 @@ services:
23
23
  - $CWD/:/app
24
24
  ports:
25
25
  - "${PORT_WEB:-8000}:80"
26
+ depends_on:
27
+ - php
26
28
  php:
27
29
  build:
28
30
  context: $FW_LARAVEL_9_PHP_CONTEXT
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fishawack/lab-env",
3
- "version": "5.2.0-beta.1",
3
+ "version": "5.2.0-beta.2",
4
4
  "description": "Docker manager for FW",
5
5
  "main": "cli.js",
6
6
  "scripts": {