diff --git a/containers/ddev-webserver/files/etc/group b/containers/ddev-webserver/files/etc/group index e272b1933ad..7cb9e52b661 100644 --- a/containers/ddev-webserver/files/etc/group +++ b/containers/ddev-webserver/files/etc/group @@ -1,5 +1,6 @@ root:x:0: nginx:x:0: +gid_0:x:0: gid_1:x:1: gid_2:x:2: gid_3:x:3: diff --git a/containers/ddev-webserver/files/etc/passwd b/containers/ddev-webserver/files/etc/passwd index e4c5b57be83..63319b7d00c 100644 --- a/containers/ddev-webserver/files/etc/passwd +++ b/containers/ddev-webserver/files/etc/passwd @@ -1,5 +1,6 @@ root:x:0:0:root:/home:/bin/bash nginx:x:0:0:root:/home:/bin/bash +uid_0:x:0:0:root:/home:/bin/bash uid_1:x:1:1:gid_1:/home:/bin/bash uid_2:x:2:2:gid_2:/home:/bin/bash uid_3:x:3:3:gid_3:/home:/bin/bash diff --git a/pkg/ddevapp/ddevapp.go b/pkg/ddevapp/ddevapp.go index 524e4b53296..b34677313f9 100644 --- a/pkg/ddevapp/ddevapp.go +++ b/pkg/ddevapp/ddevapp.go @@ -705,13 +705,13 @@ func (app *DdevApp) DockerEnv() { UIDStr = curUser.Uid GIDStr = curUser.Gid // For windows the UIDStr/GIDStr are usually way outside linux range (ends at 60000) - // so we have to run as root. We may have a host UIDStr/GIDStr greater in other contexts, - // bail and run as root. + // so we have to run as arbitrary user 1000. We may have a host UIDStr/GIDStr greater in other contexts, + // 1000 seems not to cause file permissions issues at least on docker-for-windows. if UIDInt, err = strconv.Atoi(curUser.Uid); err != nil { - UIDStr = "0" + UIDStr = "1000" } if GIDInt, err = strconv.Atoi(curUser.Gid); err != nil { - GIDStr = "0" + GIDStr = "1000" } // Warn about running as root if we're not on windows. @@ -721,8 +721,8 @@ func (app *DdevApp) DockerEnv() { // If the UIDStr or GIDStr is outside the range possible in container, use root if UIDInt > 60000 || GIDInt > 60000 { - UIDStr = "0" - GIDStr = "0" + UIDStr = "1000" + GIDStr = "1000" } envVars := map[string]string{ diff --git a/pkg/version/version.go b/pkg/version/version.go index e55c8dc125c..1fbf5876282 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -23,7 +23,7 @@ var DockerComposeFileFormatVersion = "3.6" var WebImg = "drud/ddev-webserver" // WebTag defines the default web image tag for drud dev -var WebTag = "20180911_apache_supervisor" // Note that this can be overridden by make +var WebTag = "20180913_apache_broken_on_windows" // Note that this can be overridden by make // DBImg defines the default db image used for applications. var DBImg = "drud/ddev-dbserver"