Skip to content

Commit 05be128

Browse files
committed
ansible,docker: ensure <1024 are privileged ports
Since Docker 20.10.0 @ 2020-12-08, port binding has been made unrestricted. This change undoes that by ensuring that <1024 are privileged. Node.js' test suite assumes that binding to a lower port will result in a privilege failure so we need to create an environment suitable for that assumption. Ref: nodejs/node#36847
1 parent bd5e31f commit 05be128

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ansible/roles/docker/templates/jenkins.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WantedBy=multi-user.target
99
[Service]
1010
Type=simple
1111
User=root
12-
ExecStart=/usr/bin/docker run --init --rm -v /home/{{ server_user }}/{{ item.name }}/:/home/{{ server_user }} -v /home/{{ server_user }}/.ccache/:/home/{{ server_user }}/.ccache --name node-ci-{{ item.name }} node-ci:{{ item.name }}
12+
ExecStart=/usr/bin/docker run --init --rm -v /home/{{ server_user }}/{{ item.name }}/:/home/{{ server_user }} -v /home/{{ server_user }}/.ccache/:/home/{{ server_user }}/.ccache --name node-ci-{{ item.name }} --sysctl net.ipv4.ip_unprivileged_port_start=1024 node-ci:{{ item.name }}
1313
ExecStop=/usr/bin/docker stop -t 5 node-ci-{{ item.name }}
1414
Restart=always
1515
RestartSec=30

ansible/roles/jenkins-worker/templates/docker-jenkins.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WantedBy=multi-user.target
99
[Service]
1010
Type=simple
1111
User=root
12-
ExecStart=/usr/bin/docker run --init --rm -v /home/{{ server_user }}:/home/{{ server_user }} --name node-ci-{{ item.name }} node-ci:{{ item.name }}
12+
ExecStart=/usr/bin/docker run --init --rm -v /home/{{ server_user }}:/home/{{ server_user }} --name node-ci-{{ item.name }} --sysctl net.ipv4.ip_unprivileged_port_start=1024 node-ci:{{ item.name }}
1313
ExecStop=/usr/bin/docker stop -t 5 node-ci-{{ item.name }}
1414
Restart=always
1515
RestartSec=30

0 commit comments

Comments
 (0)