Skip to content

Commit c038f2f

Browse files
khs1994khs1994
committed
[lrew] update
Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>
1 parent bf6a57f commit c038f2f

File tree

6 files changed

+71
-5
lines changed

6 files changed

+71
-5
lines changed

‎lnmp-docker‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,25 +245,51 @@ _get_compose_options(){
245245
options+=" -f $LREW_INCLUDE_ROOT/docker-compose.override.yml "
246246
fi
247247

248+
if [ -f "$LREW_INCLUDE_ROOT/docker-compose.${LNMP_ENV}.yml" ];then
249+
options+=" -f $LREW_INCLUDE_ROOT/docker-compose.${LNMP_ENV}.yml "
250+
fi
251+
248252
if [ -f "$LREW_INCLUDE_ROOT/.env.compose.default" ];then
249253
COMPOSE_ENV_FILES+="$LREW_INCLUDE_ROOT/.env.compose.default,"
250254
fi
251255

256+
if [ -f "$LREW_INCLUDE_ROOT/.env.compose.default" ] && [ ! -f "$LREW_INCLUDE_ROOT/.env.compose" ];then
257+
cp "$LREW_INCLUDE_ROOT/.env.compose.default" "$LREW_INCLUDE_ROOT/.env.compose"
258+
fi
259+
252260
if [ -f "$LREW_INCLUDE_ROOT/.env.compose" ];then
253261
COMPOSE_ENV_FILES+="$LREW_INCLUDE_ROOT/.env.compose,"
254262
fi
255263

264+
if [ -n "$LNMP_ENV" ] && [ -f "$LREW_INCLUDE_ROOT/.env.compose.default" ] && [ ! -f "$LREW_INCLUDE_ROOT/.env.compose.${LNMP_ENV}" ];then
265+
cp "$LREW_INCLUDE_ROOT/.env.compose.default" "$LREW_INCLUDE_ROOT/.env.compose.${LNMP_ENV}"
266+
fi
267+
256268
if [ -f "$LREW_INCLUDE_ROOT/.env.compose.${LNMP_ENV}" ];then
257269
COMPOSE_ENV_FILES+="$LREW_INCLUDE_ROOT/.env.compose.${LNMP_ENV},"
258270
fi
271+
272+
if [ -f "$LREW_INCLUDE_ROOT/.env.example" ] && [ ! -f "$LREW_INCLUDE_ROOT/.env" ];then
273+
cp "$LREW_INCLUDE_ROOT/.env.example" "$LREW_INCLUDE_ROOT/.env"
274+
fi
275+
276+
if [ -n "$LNMP_ENV" ] && [ -f "$LREW_INCLUDE_ROOT/.env.example" ] && [ ! -f "$LREW_INCLUDE_ROOT/.env.${LNMP_ENV}" ];then
277+
cp "$LREW_INCLUDE_ROOT/.env.example" "$LREW_INCLUDE_ROOT/.env.${LNMP_ENV}"
278+
fi
259279
done
260280

261281
for compose_file in "$@"
262282
do
263283
options+=" -f $compose_file "
264284
done
265285

266-
COMPOSE_ENV_FILES+=".env.example,$LNMP_ENV_FILE"
286+
COMPOSE_ENV_FILES+=".env.example,"
287+
288+
if [ $LNMP_ENV_FILE != ".env" -a -f .env ];then
289+
COMPOSE_ENV_FILES+=".env,"
290+
fi
291+
292+
COMPOSE_ENV_FILES+="$LNMP_ENV_FILE"
267293

268294
mkdir -p ${ScriptRoot}/.debug
269295

‎lnmp-docker.ps1‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,17 +483,37 @@ Function Get-ComposeOptions($compose_file_base, $compose_files) {
483483
$COMPOSE_FILE_ARRAY += "$LREW_INCLUDE_ROOT/docker-compose.override.yml"
484484
}
485485

486+
if (Test-Path "$LREW_INCLUDE_ROOT/docker-compose.${env:LNMP_ENV}.yml") {
487+
$COMPOSE_FILE_ARRAY += "$LREW_INCLUDE_ROOT/docker-compose.${env:LNMP_ENV}.yml"
488+
}
489+
486490
if (Test-Path $LREW_INCLUDE_ROOT/.env.compose.default) {
487491
$COMPOSE_ENV_FILES_ARRAY += "$LREW_INCLUDE_ROOT/.env.compose.default"
488492
}
489493

494+
if ((Test-Path $LREW_INCLUDE_ROOT/.env.compose.default) -and !(Test-Path $LREW_INCLUDE_ROOT/.env.compose)) {
495+
Copy-Item "$LREW_INCLUDE_ROOT/.env.compose.default" "$LREW_INCLUDE_ROOT/.env.compose"
496+
}
497+
490498
if (Test-Path $LREW_INCLUDE_ROOT/.env.compose) {
491499
$COMPOSE_ENV_FILES_ARRAY += "$LREW_INCLUDE_ROOT/.env.compose"
492500
}
493501

502+
if ((Test-Path env:LNMP_ENV) -and (Test-Path $LREW_INCLUDE_ROOT/.env.compose.default) -and !(Test-Path $LREW_INCLUDE_ROOT/.env.compose.${env:LNMP_ENV})) {
503+
Copy-Item "$LREW_INCLUDE_ROOT/.env.compose.default" "$LREW_INCLUDE_ROOT/.env.compose.${env:LNMP_ENV}"
504+
}
505+
494506
if (Test-Path $LREW_INCLUDE_ROOT/.env.compose.${env:LNMP_ENV}) {
495507
$COMPOSE_ENV_FILES_ARRAY += "$LREW_INCLUDE_ROOT/.env.compose.${env:LNMP_ENV}"
496508
}
509+
510+
if ((Test-Path $LREW_INCLUDE_ROOT/.env.example) -and !(Test-PATH $LREW_INCLUDE_ROOT/.env)) {
511+
cp $LREW_INCLUDE_ROOT/.env.example $LREW_INCLUDE_ROOT/.env
512+
}
513+
514+
if ((Test-Path env:LNMP_ENV) -and (Test-Path $LREW_INCLUDE_ROOT/.env.example) -and !(Test-PATH $LREW_INCLUDE_ROOT/.env.${env:LNMP_ENV})) {
515+
Copy-Item $LREW_INCLUDE_ROOT/.env.example $LREW_INCLUDE_ROOT/.env.${env:LNMP_ENV}
516+
}
497517
}
498518

499519
Foreach ($compose_file in $compose_files) {
@@ -503,6 +523,11 @@ Function Get-ComposeOptions($compose_file_base, $compose_files) {
503523
}
504524

505525
$COMPOSE_ENV_FILES_ARRAY += '.env.example'
526+
527+
if (($LNMP_ENV_FILE -ne '.env') -and (Test-Path .env)) {
528+
$COMPOSE_ENV_FILES_ARRAY += '.env'
529+
}
530+
506531
$COMPOSE_ENV_FILES_ARRAY += $LNMP_ENV_FILE
507532

508533
$env:COMPOSE_ENV_FILES = $COMPOSE_ENV_FILES_ARRAY -join ','
@@ -512,7 +537,7 @@ Function Get-ComposeOptions($compose_file_base, $compose_files) {
512537
$env:COMPOSE_PATH_SEPARATOR = ';'
513538
$env:COMPOSE_FILE = $COMPOSE_FILE_ARRAY -join ';'
514539

515-
mkdir -force $PSScriptRoot/.debug
540+
mkdir -force $PSScriptRoot/.debug | Out-Null
516541

517542
Write-Output $env:COMPOSE_FILE > $PSScriptRoot/.debug/COMPOSE_FILE
518543
Write-Output $env:COMPOSE_ENV_FILES > $PSScriptRoot/.debug/COMPOSE_ENV_FILES
@@ -651,7 +676,11 @@ else {
651676
$env:APP_ROOT = $APP_ROOT
652677

653678
# LNMP_SERVICES
654-
$LNMP_SERVICES_CONTENT = (cat $PSScriptRoot/$LNMP_ENV_FILE | select-string ^LNMP_SERVICES=)
679+
$LNMP_SERVICES_CONTENT = (cat $PSScriptRoot/.env | select-string ^LNMP_SERVICES=)
680+
$LNMP_SERVICES_CONTENT_LNMP_ENV = (cat $PSScriptRoot/$LNMP_ENV_FILE | select-string ^LNMP_SERVICES=)
681+
if ($LNMP_SERVICES_CONTENT_LNMP_ENV) {
682+
$LNMP_SERVICES_CONTENT = $LNMP_SERVICES_CONTENT_LNMP_ENV
683+
}
655684
if ($LNMP_SERVICES_CONTENT) {
656685
$LNMP_SERVICES = $LNMP_SERVICES_CONTENT.Line.Split('=')[-1].Trim('"').split(' ')
657686
}
@@ -660,7 +689,11 @@ else {
660689
}
661690

662691
# LREW_INCLUDE
663-
$LREW_INCLUDE_CONTENT = (cat $PSScriptRoot/$LNMP_ENV_FILE | select-string ^LREW_INCLUDE=)
692+
$LREW_INCLUDE_CONTENT = (cat $PSScriptRoot/.env | select-string ^LREW_INCLUDE=)
693+
$LREW_INCLUDE_CONTENT_LNMP_ENV = (cat $PSScriptRoot/$LNMP_ENV_FILE | select-string ^LREW_INCLUDE=)
694+
if ($LREW_INCLUDE_CONTENT_LNMP_ENV) {
695+
$LREW_INCLUDE_CONTENT = $LREW_INCLUDE_CONTENT_LNMP_ENV
696+
}
664697
if ($LREW_INCLUDE_CONTENT) {
665698
$LREW_INCLUDE = $LREW_INCLUDE_CONTENT.Line.Split('=')[-1].Trim('"').split(' ')
666699
}

‎lrew/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
!.dockerignore
2222
!deno
2323
docker-compose.override.yml
24-
docker-compose.override.yaml
24+
docker-compose.*.yml
2525
.env.compose
2626
.env.compose.*
2727
!.env.compose.default

‎lrew/example/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.env.compose
33
.env.compose.*
44
!.env.compose.default
5+
docker-compose.*.yml

‎lrew/example/docker-compose.development.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
services:
2+
example:
3+
env_file:
4+
- ./vendor/${LREW_EXAMPLE_VENDOR:-lrew}/example/.env.development

‎lrew/example/docker-compose.override.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
services:
2+
example:

0 commit comments

Comments
 (0)