@fishawack/lab-env 4.25.2 → 4.26.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/CHANGELOG.md +7 -1
- package/core/1/package.json +1 -1
- package/globals.js +11 -0
- package/laravel/9/docker-compose.yml +2 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
## Changelog
|
|
2
2
|
|
|
3
|
-
### 4.
|
|
3
|
+
### 4.26.0 (2024-03-20)
|
|
4
|
+
* [Feature] can override laravel 8 nginx dockerfile in project root
|
|
5
|
+
|
|
6
|
+
### 4.25.3 (2024-02-09)
|
|
4
7
|
* [Change] Bumped fishawack/lab-env-core-1 to 1.3.3
|
|
5
8
|
|
|
9
|
+
### 4.25.2 (2024-02-09)
|
|
10
|
+
* [Misc] no changes due to issue with deployment
|
|
11
|
+
|
|
6
12
|
### 4.25.1 (2024-01-24)
|
|
7
13
|
* [Change] Bumped fishawack/lab-env-core-1 to 1.3.2
|
|
8
14
|
|
package/core/1/package.json
CHANGED
package/globals.js
CHANGED
|
@@ -146,6 +146,8 @@ process.env.FW_CORE_1_TARGET_IMAGE = process.env.FW_CORE_1_TARGET_IMAGE || (proc
|
|
|
146
146
|
process.env.FW_CORE_1_TARGET = process.env.FW_CORE_1_TARGET || (process.env.FW_FULL ? "full" : "alpine");
|
|
147
147
|
process.env.FW_CORE_1_IMAGE = process.env.FW_CORE_1_IMAGE || `fishawack/lab-env-core-1${process.env.FW_CORE_1_TARGET_IMAGE}`;
|
|
148
148
|
|
|
149
|
+
process.env.FW_LARAVEL_8_NGINX_IMAGE = process.env.FW_LARAVEL_8_NGINX_IMAGE || `fishawack/lab-env-laravel-8-nginx`;
|
|
150
|
+
|
|
149
151
|
var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
|
|
150
152
|
|
|
151
153
|
// Map versions of images
|
|
@@ -171,6 +173,15 @@ if(existsSync(path.join(contextOverride, 'Dockerfile'))){
|
|
|
171
173
|
process.env.FW_CORE_1_IMAGE += `-${repo_safe}`;
|
|
172
174
|
}
|
|
173
175
|
|
|
176
|
+
process.env.FW_LARAVEL_8_NGINX_CONTEXT = process.env.FW_LARAVEL_8_NGINX_CONTEXT || `${__dirname}/laravel/8/nginx/`;
|
|
177
|
+
|
|
178
|
+
contextOverride = path.join(cwd, '_Docker/laravel/8/nginx');
|
|
179
|
+
if(existsSync(path.join(contextOverride, 'Dockerfile'))){
|
|
180
|
+
process.env.FW_LARAVEL_8_NGINX_CONTEXT = contextOverride;
|
|
181
|
+
process.env.FW_LARAVEL_8_NGINX_IMAGE += `-${repo_safe}`;
|
|
182
|
+
process.env.FW_LARAVEL_8_NGINX_VERSION = require(`${contextOverride}/package.json`).version;
|
|
183
|
+
}
|
|
184
|
+
|
|
174
185
|
if(existsSync(path.join(cwd, '.env.example')) && !existsSync(path.join(cwd, '.env'))){
|
|
175
186
|
copyFileSync(path.join(cwd, '.env.example'), path.join(cwd, '.env'));
|
|
176
187
|
}
|
|
@@ -14,9 +14,9 @@ services:
|
|
|
14
14
|
- mysql:/var/lib/mysql
|
|
15
15
|
nginx:
|
|
16
16
|
build:
|
|
17
|
-
context: $
|
|
17
|
+
context: $FW_LARAVEL_8_NGINX_CONTEXT
|
|
18
18
|
target: development
|
|
19
|
-
image:
|
|
19
|
+
image: $FW_LARAVEL_8_NGINX_IMAGE:${FW_LARAVEL_8_NGINX_VERSION:-latest}
|
|
20
20
|
networks:
|
|
21
21
|
- default
|
|
22
22
|
volumes:
|