Skip to content

Commit c86adaf

Browse files
committed
ci: extract enabling ipv6 on docker into a script
1 parent fa56eb2 commit c86adaf

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

src/ci/azure-pipelines/steps/run.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,11 @@ steps:
111111
displayName: Install ninja
112112
condition: and(succeeded(), not(variables.SKIP_JOB))
113113

114-
# Looks like docker containers have IPv6 disabled by default, so let's turn it
115-
# on since libstd tests require it
116-
- bash: |
117-
set -e
118-
sudo mkdir -p /etc/docker
119-
echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json
120-
sudo service docker restart
121-
displayName: Enable IPv6
122-
condition: and(succeeded(), not(variables.SKIP_JOB), eq(variables['Agent.OS'], 'Linux'))
114+
- bash: src/ci/scripts/enable-docker-ipv6.sh
115+
env:
116+
AGENT_OS: $(Agent.OS)
117+
displayName: Enable IPv6 on Docker
118+
condition: and(succeeded(), not(variables.SKIP_JOB))
123119

124120
# Disable automatic line ending conversion (again). On Windows, when we're
125121
# installing dependencies, something switches the git configuration directory or

src/ci/scripts/enable-docker-ipv6.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
# Looks like docker containers have IPv6 disabled by default, so let's turn it
3+
# on since libstd tests require it
4+
5+
set -euo pipefail
6+
IFS=$'\n\t'
7+
8+
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
9+
10+
if isLinux; then
11+
sudo mkdir -p /etc/docker
12+
echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json
13+
sudo service docker restart
14+
fi

0 commit comments

Comments
 (0)