From 0d8fb3dc206736d311f2fa3f61ff49718feed6d2 Mon Sep 17 00:00:00 2001 From: Jacob Seman <90524106+Jbsco@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:09:42 -0700 Subject: [PATCH 1/5] Update create_container.sh special casing for windows systems and winpty prefix not needed so long as Docker CLI is on path --- docker/create_container.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/create_container.sh b/docker/create_container.sh index 84571d6..f499f16 100755 --- a/docker/create_container.sh +++ b/docker/create_container.sh @@ -11,11 +11,7 @@ execute "docker run -d \ # Run docker provision script inside of container to get things set up: echo "Provisioning container..." -if [ -n "$ON_WINDOWS" ]; then - execute "winpty docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//provision//provision_container.sh" -else - execute "docker exec -u user $DOCKER_CONTAINER_NAME /share/adamant_example/docker/env/provision/provision_container.sh" -fi +execute "docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//provision//provision_container.sh" echo "Finished creating container \"$DOCKER_CONTAINER_NAME\"." execute "docker ps -a" From 945a2722397b49c960092fdd847254ef3a42f75c Mon Sep 17 00:00:00 2001 From: Jacob Seman <90524106+Jbsco@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:10:11 -0700 Subject: [PATCH 2/5] Update login_container.sh special casing for windows systems and winpty prefix not needed so long as Docker CLI is on path --- docker/login_container.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/login_container.sh b/docker/login_container.sh index aec531b..9e6536f 100755 --- a/docker/login_container.sh +++ b/docker/login_container.sh @@ -2,8 +2,4 @@ . ./docker_config.sh -if [ -n "$ON_WINDOWS" ]; then - execute "winpty docker exec -it -u user $DOCKER_CONTAINER_NAME //bin//bash" -else - execute "docker exec -it -u user $DOCKER_CONTAINER_NAME /bin/bash" -fi +execute "docker exec -it -u user $DOCKER_CONTAINER_NAME //bin//bash" From 84f7e7f6c93cd335f2e76fe6409076cec5cdb3d9 Mon Sep 17 00:00:00 2001 From: Jacob Seman <90524106+Jbsco@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:10:31 -0700 Subject: [PATCH 3/5] Update start_container.sh special casing for windows systems and winpty prefix not needed so long as Docker CLI is on path --- docker/start_container.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/start_container.sh b/docker/start_container.sh index f8bf381..2367eb0 100755 --- a/docker/start_container.sh +++ b/docker/start_container.sh @@ -2,9 +2,5 @@ . ./docker_config.sh execute "docker start $DOCKER_CONTAINER_NAME" -if [ -n "$ON_WINDOWS" ]; then - execute "winpty docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//start_unison.sh &" -else - execute "docker exec -u user $DOCKER_CONTAINER_NAME /share/adamant_example/docker/env/start_unison.sh &" -fi +execute "docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//start_unison.sh &" execute "docker ps -a" From 8f5195842f236df8bd3988f53f04d7f53d60eefd Mon Sep 17 00:00:00 2001 From: Jacob Seman Date: Tue, 28 Nov 2023 10:16:55 -0700 Subject: [PATCH 4/5] special casing for windows systems and winpty prefix not needed so long as Docker CLI is on path --- docker/create_container.sh | 6 +----- docker/login_container.sh | 6 +----- docker/start_container.sh | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/docker/create_container.sh b/docker/create_container.sh index 84571d6..f499f16 100755 --- a/docker/create_container.sh +++ b/docker/create_container.sh @@ -11,11 +11,7 @@ execute "docker run -d \ # Run docker provision script inside of container to get things set up: echo "Provisioning container..." -if [ -n "$ON_WINDOWS" ]; then - execute "winpty docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//provision//provision_container.sh" -else - execute "docker exec -u user $DOCKER_CONTAINER_NAME /share/adamant_example/docker/env/provision/provision_container.sh" -fi +execute "docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//provision//provision_container.sh" echo "Finished creating container \"$DOCKER_CONTAINER_NAME\"." execute "docker ps -a" diff --git a/docker/login_container.sh b/docker/login_container.sh index aec531b..9e6536f 100755 --- a/docker/login_container.sh +++ b/docker/login_container.sh @@ -2,8 +2,4 @@ . ./docker_config.sh -if [ -n "$ON_WINDOWS" ]; then - execute "winpty docker exec -it -u user $DOCKER_CONTAINER_NAME //bin//bash" -else - execute "docker exec -it -u user $DOCKER_CONTAINER_NAME /bin/bash" -fi +execute "docker exec -it -u user $DOCKER_CONTAINER_NAME //bin//bash" diff --git a/docker/start_container.sh b/docker/start_container.sh index f8bf381..2367eb0 100755 --- a/docker/start_container.sh +++ b/docker/start_container.sh @@ -2,9 +2,5 @@ . ./docker_config.sh execute "docker start $DOCKER_CONTAINER_NAME" -if [ -n "$ON_WINDOWS" ]; then - execute "winpty docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//start_unison.sh &" -else - execute "docker exec -u user $DOCKER_CONTAINER_NAME /share/adamant_example/docker/env/start_unison.sh &" -fi +execute "docker exec -u user $DOCKER_CONTAINER_NAME //share//adamant_example//docker//env//start_unison.sh &" execute "docker ps -a" From 90fb998768ad15a7836193d155d83600c70d8deb Mon Sep 17 00:00:00 2001 From: Jacob Seman <90524106+Jbsco@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:42:21 -0700 Subject: [PATCH 5/5] Update docker_config.sh Removed the ON_WINDOWS case statement in docker_config.sh --- docker/docker_config.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker/docker_config.sh b/docker/docker_config.sh index f7e00c7..ed171dc 100755 --- a/docker/docker_config.sh +++ b/docker/docker_config.sh @@ -5,13 +5,6 @@ DOCKER_IMAGE_NAME="ghcr.io/lasp/adamant:example-latest" export DOCKER_CONTAINER_NAME export DOCKER_IMAGE_NAME -case "$OSTYPE" in - cygwin|msys|win32) - ON_WINDOWS="yes" - export ON_WINDOWS - ;; -esac - # Helper function to print out command as executed: execute () { echo "$ $@"