From bfd9b512813e98a49065c490799ec4ce7ddaecb3 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Thu, 6 May 2021 03:36:32 -0500 Subject: [PATCH] Add regex corrections for alpine in the Docker export scripts --- docker/scripts/export_builds.sh | 9 ++++++++- docker/scripts/export_deps.sh | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docker/scripts/export_builds.sh b/docker/scripts/export_builds.sh index 7271adb..81a02fb 100755 --- a/docker/scripts/export_builds.sh +++ b/docker/scripts/export_builds.sh @@ -3,7 +3,14 @@ # Create the exported directory mkdir -p build +if [ "$1" = "alpine" ]; then + REGEX='\./\(\(api\|packages\)/[^/]\+/dist/lib\|services/[^/]\+/dist\)' +else + REGEX='\./\(\(api\|packages\)/[^/]+/dist/lib\|services/[^/]+/dist\)' +fi + # Locate services/packages and grab only the built files (excluding types if any) -for file in $(find . -regex '\./\(\(api\|packages\)/[^/]+/dist/lib\|services/[^/]+/dist\)'); do +for file in $(find . -regex $REGEX); do + echo $file; cp --parents -R $file build; done diff --git a/docker/scripts/export_deps.sh b/docker/scripts/export_deps.sh index 6bb4d2e..a48086b 100644 --- a/docker/scripts/export_deps.sh +++ b/docker/scripts/export_deps.sh @@ -3,7 +3,14 @@ # Create the exported directory mkdir -p build +if [ "$1" = "alpine" ]; then + REGEX='\./\(api\|services\|packages\)/[^/]\+/\(package.json\|node_modules\)' +else + REGEX='\./\(api\|services\|packages\)/[^/]+/\(package.json\|node_modules\)' +fi + # Locate services/packages and grab only the dependencies + package.json -for file in $(find . -regex '\./\(api\|services\|packages\)/[^/]+/\(package.json\|node_modules\)'); do +for file in $(find . -regex $REGEX); do + echo $file; cp --parents -R $file build; done