diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/docker-shell | 9 | ||||
| -rwxr-xr-x | bin/setup | 2 | ||||
| -rwxr-xr-x | bin/test | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/bin/docker-shell b/bin/docker-shell index d75bd7c..07b2a70 100755 --- a/bin/docker-shell +++ b/bin/docker-shell @@ -5,9 +5,12 @@ set -e cd "$(dirname "$0")/.." IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} +root_dir=/builds/gitlab-org/security-products/analyzers/license-finder docker run --rm -it \ - --entrypoint='' \ + --entrypoint='bash' \ --network=host \ - --volume "$PWD":/builds/gitlab-org/security-products/analyzers/license-finder \ - "$IMAGE_NAME" sh -c 'cd /builds/gitlab-org/security-products/analyzers/license-finder && exec bash -l' + --env=RUBYLIB="${root_dir}/lib" \ + --workdir="${root_dir}" \ + --volume "$PWD":"${root_dir}" \ + "$IMAGE_NAME" -l @@ -4,7 +4,7 @@ set -e cd "$(dirname "$0")/.." -export PATH="/builds/gitlab-org/security-products/analyzers/license-finder/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +export PATH="$PWD/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" if [ ! -f /usr/sbin/haproxy ] && command -v apt-get; then curl https://haproxy.debian.net/bernat.debian.org.gpg | apt-key add - @@ -4,10 +4,6 @@ set -e cd "$(dirname "$0")/.." -export PATH="/builds/gitlab-org/security-products/analyzers/license-finder/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -export RUBYLIB="/builds/gitlab-org/security-products/analzyers/license-finder/lib" +export PATH="$PWD/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -if ! command -v bundle; then - ./bin/setup -fi bundle exec rspec "$@" --format=progress |