diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2019-10-08 11:46:55 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2019-10-25 16:08:32 +0200 |
| commit | d264e954dc885bcb9cc5cc35cbbff862dffff6db (patch) | |
| tree | 86fd45af5ac9aacab1472bc0369f858e1defa50e /src/ci | |
| parent | bc9a0dc1b347d5d2ff361d0d501e3836f30affe0 (diff) | |
| download | rust-d264e954dc885bcb9cc5cc35cbbff862dffff6db.tar.gz rust-d264e954dc885bcb9cc5cc35cbbff862dffff6db.zip | |
ci: extract enabling ipv6 on docker into a script
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/azure-pipelines/steps/run.yml | 14 | ||||
| -rwxr-xr-x | src/ci/scripts/enable-docker-ipv6.sh | 14 |
2 files changed, 19 insertions, 9 deletions
diff --git a/src/ci/azure-pipelines/steps/run.yml b/src/ci/azure-pipelines/steps/run.yml index 04281e54cf4..0562b28ca9c 100644 --- a/src/ci/azure-pipelines/steps/run.yml +++ b/src/ci/azure-pipelines/steps/run.yml @@ -111,15 +111,11 @@ steps: displayName: Install ninja condition: and(succeeded(), not(variables.SKIP_JOB)) -# Looks like docker containers have IPv6 disabled by default, so let's turn it -# on since libstd tests require it -- bash: | - set -e - sudo mkdir -p /etc/docker - echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json - sudo service docker restart - displayName: Enable IPv6 - condition: and(succeeded(), not(variables.SKIP_JOB), eq(variables['Agent.OS'], 'Linux')) +- bash: src/ci/scripts/enable-docker-ipv6.sh + env: + AGENT_OS: $(Agent.OS) + displayName: Enable IPv6 on Docker + condition: and(succeeded(), not(variables.SKIP_JOB)) # Disable automatic line ending conversion (again). On Windows, when we're # installing dependencies, something switches the git configuration directory or diff --git a/src/ci/scripts/enable-docker-ipv6.sh b/src/ci/scripts/enable-docker-ipv6.sh new file mode 100755 index 00000000000..35bb0ad7d29 --- /dev/null +++ b/src/ci/scripts/enable-docker-ipv6.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# Looks like docker containers have IPv6 disabled by default, so let's turn it +# on since libstd tests require it + +set -euo pipefail +IFS=$'\n\t' + +source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" + +if isLinux; then + sudo mkdir -p /etc/docker + echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json + sudo service docker restart +fi |