Skip to content

Commit 19b0d5a

Browse files
Merge pull request #383 from step-security/revert-userns-1
Revert docker-user mapping
2 parents 6c6bfb6 + 444883b commit 19b0d5a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dnsconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func updateDockerConfig(configPath string) error {
4848

4949
m["dns"] = []string{dockerDnsServer}
5050
m["live-restore"] = true
51-
m["userns-remap"] = "runner:runner" // Checkout: https://docs.docker.com/engine/security/userns-remap/#enable-userns-remap-on-the-daemon
51+
// m["userns-remap"] = "runner:runner" // Checkout: https://docs.docker.com/engine/security/userns-remap/#enable-userns-remap-on-the-daemon
5252

5353
config, err := json.Marshal(m)
5454
if err != nil {

dnsconfig_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ func Test_updateDockerConfig(t *testing.T) {
4141
}{
4242
{name: "existing file",
4343
args: args{configPath: tmpFileName},
44-
want: "{\"cgroup-parent\":\"/actions_job\",\"dns\":[\"172.17.0.1\"],\"live-restore\":true,\"userns-remap\":\"runner:runner\"}",
44+
want: "{\"cgroup-parent\":\"/actions_job\",\"dns\":[\"172.17.0.1\"],\"live-restore\":true}",
4545
wantErr: false},
4646
{name: "non existent file",
4747
args: args{configPath: mockDockerConfigPath},
48-
want: "{\"dns\":[\"172.17.0.1\"],\"live-restore\":true,\"userns-remap\":\"runner:runner\"}",
48+
want: "{\"dns\":[\"172.17.0.1\"],\"live-restore\":true}",
4949
wantErr: false},
5050
}
5151

0 commit comments

Comments
 (0)