diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-05-06 11:42:04 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-05-06 11:42:04 +0000 |
| commit | 6b40d051f8325ea957e60fc37abe26e97c5de2b6 (patch) | |
| tree | f64e2d51b783c339609958de8af3564ecc92e632 /bin | |
| parent | 8e427c7987e90a028e6d9f344a9f70bb13b6eee4 (diff) | |
| parent | b963d8d572fdf93d9c76e45d400465d8c5c2fae0 (diff) | |
Merge branch '212921-offline-npm' into 'master'v3.8.0
Specify a custom CA for npm
See merge request gitlab-org/security-products/license-management!145
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/docker-build | 2 | ||||
| -rwxr-xr-x | bin/docker-shell | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/docker-build b/bin/docker-build index 39a9160..2cd819f 100755 --- a/bin/docker-build +++ b/bin/docker-build @@ -6,7 +6,7 @@ cd "$(dirname "$0")/.." if command -v docker; then IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} - docker build -t "$IMAGE_NAME" . + docker build --network=host -t "$IMAGE_NAME" . else echo "Install docker: https://docs.docker.com/engine/installation/" exit 1 diff --git a/bin/docker-shell b/bin/docker-shell index 6d146a8..617492a 100755 --- a/bin/docker-shell +++ b/bin/docker-shell @@ -8,5 +8,6 @@ IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} docker run --rm -it \ --entrypoint='' \ + --network=host \ --volume "$PWD":/opt/license-management \ "$IMAGE_NAME" /bin/bash -l |