From 511df6d78aaa1f986b2a33e542e7dd871b6f75d8 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 16 Mar 2023 14:18:52 -0400 Subject: [PATCH 1/2] fix: Don't create yml-r files on OSx Use sed portably, "sed bar" and avoid the flags. --- docker/run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/run b/docker/run index cc0a19941f2..efa24494e10 100755 --- a/docker/run +++ b/docker/run @@ -41,8 +41,9 @@ done rm -rf .parcel-cache __pycache__ # Create extended docker-compose definition -cp docker-compose.extend.yml docker-compose.extend-custom.yml -sed -i -r -e "s/CUSTOM_PORT/$CUSTOM_PORT/" docker-compose.extend-custom.yml +sed -e "s/CUSTOM_PORT/$CUSTOM_PORT/" \ + docker-compose.extend-custom.yml cd .. # Set UID/GID mappings From 0e7e7d94b747dc13e4a7156f727b1bcc50884da5 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Fri, 14 Apr 2023 09:12:02 -0400 Subject: [PATCH 2/2] Update docker/run Fix command line, per Carsten. Co-authored-by: cabo --- docker/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/run b/docker/run index efa24494e10..68246d891e3 100755 --- a/docker/run +++ b/docker/run @@ -42,7 +42,7 @@ rm -rf .parcel-cache __pycache__ # Create extended docker-compose definition sed -e "s/CUSTOM_PORT/$CUSTOM_PORT/" \ - docker-compose.extend-custom.yml cd ..