diff options
author | 2019-12-16 11:16:48 -0800 | |
---|---|---|
committer | 2019-12-16 11:16:48 -0800 | |
commit | 4d41ba2bbcde47d1304d25c53953e5de62c24d64 (patch) | |
tree | 14ccc8d64cc9cfb71f3329a5e4ee7c1e6ea9f2c0 /scripts/dev.sh | |
parent | Merge pull request #50 from python-discord/python-3.8 (diff) | |
parent | Pin external dependencies (diff) |
Merge pull request #51 from python-discord/3-external-libs
Add external libraries and update image
Diffstat (limited to 'scripts/dev.sh')
-rwxr-xr-x | scripts/dev.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/dev.sh b/scripts/dev.sh index 8f5b24f..6aeb1de 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh # Sets up a development environment and runs a shell in a docker container. -# Usage: dev.sh [--build [--clean]] [ash_args ...] +# Usage: dev.sh [--build [--clean]] [bash_args ...] if [ "$1" = "--build" ]; then shift @@ -42,15 +42,15 @@ docker run \ --hostname pdsnk-dev \ -e PYTHONDONTWRITEBYTECODE=1 \ -e PIPENV_PIPFILE="/snekbox/Pipfile" \ - -e ENV="${PWD}/scripts/.profile" \ + -e BASH_ENV="${PWD}/scripts/.profile" \ --volume "${PWD}":"${PWD}" \ --workdir "${PWD}"\ - --entrypoint /bin/ash \ + --entrypoint /bin/bash \ pythondiscord/snekbox-venv:dev \ >/dev/null \ # Execute the given command(s) -docker exec -it snekbox_test /bin/ash "$@" +docker exec -it snekbox_test /bin/bash --rcfile "${PWD}/scripts/.profile" "$@" # Fix ownership of coverage file # BusyBox doesn't support --reference for chown @@ -58,7 +58,7 @@ docker exec \ -it \ -e CWD="${PWD}" \ snekbox_test \ - /bin/ash \ + /bin/bash \ -c 'chown "$(stat -c "%u:%g" "${CWD}")" "${CWD}/.coverage"' docker rm -f snekbox_test >/dev/null # Stop and remove the container |