Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update docker scripts under Windows #9

Merged
merged 7 commits into from
Nov 28, 2023
Merged

Update docker scripts under Windows #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d8fb3d
Update create_container.sh
Jbsco Nov 28, 2023
945a272
Update login_container.sh
Jbsco Nov 28, 2023
84f7e7f
Update start_container.sh
Jbsco Nov 28, 2023
8f51958
special casing for windows systems and winpty prefix not needed so lo…
Jbsco Nov 28, 2023
ce43382
special casing for windows systems and winpty prefix not needed so lo…
Jbsco Nov 28, 2023
90fb998
Update docker_config.sh
Jbsco Nov 28, 2023
d08966a
Merge pull request #1 from Jbsco/patch-1
Jbsco Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions docker/create_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 0 additions & 7 deletions docker/docker_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$ $@"
Expand Down
6 changes: 1 addition & 5 deletions docker/login_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 1 addition & 5 deletions docker/start_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading