Skip to content

Commit 47c56e4

Browse files
author
John Howard
committed
Windows: Factoring out unused fields
Signed-off-by: John Howard <[email protected]>
1 parent 33358f8 commit 47c56e4

26 files changed

Lines changed: 649 additions & 544 deletions

‎api/server/server.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,12 +1205,8 @@ func (s *Server) getContainersByName(version version.Version, w http.ResponseWri
12051205
return fmt.Errorf("Missing parameter")
12061206
}
12071207

1208-
if version.LessThan("1.20") {
1209-
containerJSONRaw, err := s.daemon.ContainerInspectPre120(vars["name"])
1210-
if err != nil {
1211-
return err
1212-
}
1213-
return writeJSON(w, http.StatusOK, containerJSONRaw)
1208+
if version.LessThan("1.20") && runtime.GOOS != "windows" {
1209+
return getContainersByNameDownlevel(w, s, vars["name"])
12141210
}
12151211

12161212
containerJSON, err := s.daemon.ContainerInspect(vars["name"])

‎api/server/server_linux.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,13 @@ func adjustCpuShares(version version.Version, hostConfig *runconfig.HostConfig)
121121
}
122122
}
123123
}
124+
125+
// getContainersByNameDownlevel performs processing for pre 1.20 APIs. This
126+
// is only relevant on non-Windows daemons.
127+
func getContainersByNameDownlevel(w http.ResponseWriter, s *Server, namevar string) error {
128+
containerJSONRaw, err := s.daemon.ContainerInspectPre120(namevar)
129+
if err != nil {
130+
return err
131+
}
132+
return writeJSON(w, http.StatusOK, containerJSONRaw)
133+
}

‎api/server/server_windows.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,9 @@ func allocateDaemonPort(addr string) error {
6060

6161
func adjustCpuShares(version version.Version, hostConfig *runconfig.HostConfig) {
6262
}
63+
64+
// getContainersByNameDownlevel performs processing for pre 1.20 APIs. This
65+
// is only relevant on non-Windows daemons.
66+
func getContainersByNameDownlevel(w http.ResponseWriter, s *Server, namevar string) error {
67+
return nil
68+
}

‎api/types/types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ type ContainerJSON struct {
250250
Config *runconfig.Config
251251
}
252252

253-
// backcompatibility struct along with ContainerConfig
253+
// backcompatibility struct along with ContainerConfig. Note this is not
254+
// used by the Windows daemon.
254255
type ContainerJSONPre120 struct {
255256
*ContainerJSONBase
256257
Volumes map[string]string

‎daemon/archive.go‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ import (
1717
// path does not refer to a directory.
1818
var ErrExtractPointNotDirectory = errors.New("extraction point is not a directory")
1919

20-
// ContainerCopy performs a depracated operation of archiving the resource at
20+
// ContainerCopy performs a deprecated operation of archiving the resource at
2121
// the specified path in the conatiner identified by the given name.
2222
func (daemon *Daemon) ContainerCopy(name string, res string) (io.ReadCloser, error) {
2323
container, err := daemon.Get(name)
2424
if err != nil {
2525
return nil, err
2626
}
2727

28-
if res[0] == '/' {
28+
if res[0] == '/' || res[0] == '\\' {
2929
res = res[1:]
3030
}
3131

@@ -90,7 +90,7 @@ func (container *Container) StatPath(path string) (stat *types.ContainerPathStat
9090
// Consider the given path as an absolute path in the container.
9191
absPath := path
9292
if !filepath.IsAbs(absPath) {
93-
absPath = archive.PreserveTrailingDotOrSeparator(filepath.Join("/", path), path)
93+
absPath = archive.PreserveTrailingDotOrSeparator(filepath.Join(string(os.PathSeparator), path), path)
9494
}
9595

9696
resolvedPath, err := container.GetResourcePath(absPath)
@@ -157,7 +157,7 @@ func (container *Container) ArchivePath(path string) (content io.ReadCloser, sta
157157
// Consider the given path as an absolute path in the container.
158158
absPath := path
159159
if !filepath.IsAbs(absPath) {
160-
absPath = archive.PreserveTrailingDotOrSeparator(filepath.Join("/", path), path)
160+
absPath = archive.PreserveTrailingDotOrSeparator(filepath.Join(string(os.PathSeparator), path), path)
161161
}
162162

163163
resolvedPath, err := container.GetResourcePath(absPath)
@@ -230,7 +230,7 @@ func (container *Container) ExtractToDir(path string, noOverwriteDirNonDir bool,
230230
// Consider the given path as an absolute path in the container.
231231
absPath := path
232232
if !filepath.IsAbs(absPath) {
233-
absPath = archive.PreserveTrailingDotOrSeparator(filepath.Join("/", path), path)
233+
absPath = archive.PreserveTrailingDotOrSeparator(filepath.Join(string(os.PathSeparator), path), path)
234234
}
235235

236236
resolvedPath, err := container.GetResourcePath(absPath)
@@ -261,19 +261,14 @@ func (container *Container) ExtractToDir(path string, noOverwriteDirNonDir bool,
261261
if err != nil {
262262
return err
263263
}
264-
absPath = filepath.Join("/", baseRel)
264+
absPath = filepath.Join(string(os.PathSeparator), baseRel)
265265

266266
// Need to check if the path is in a volume. If it is, it cannot be in a
267267
// read-only volume. If it is not in a volume, the container cannot be
268268
// configured with a read-only rootfs.
269-
var toVolume bool
270-
for _, mnt := range container.MountPoints {
271-
if toVolume = mnt.hasResource(absPath); toVolume {
272-
if mnt.RW {
273-
break
274-
}
275-
return ErrVolumeReadonly
276-
}
269+
toVolume, err := checkIfPathIsInAVolume(container, absPath)
270+
if err != nil {
271+
return err
277272
}
278273

279274
if !toVolume && container.hostConfig.ReadonlyRootfs {

‎daemon/archive_unix.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// +build !windows
2+
3+
package daemon
4+
5+
// checkIfPathIsInAVolume checks if the path is in a volume. If it is, it
6+
// cannot be in a read-only volume. If it is not in a volume, the container
7+
// cannot be configured with a read-only rootfs.
8+
func checkIfPathIsInAVolume(container *Container, absPath string) (bool, error) {
9+
var toVolume bool
10+
for _, mnt := range container.MountPoints {
11+
if toVolume = mnt.hasResource(absPath); toVolume {
12+
if mnt.RW {
13+
break
14+
}
15+
return false, ErrVolumeReadonly
16+
}
17+
}
18+
return toVolume, nil
19+
}

‎daemon/archive_windows.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package daemon
2+
3+
// checkIfPathIsInAVolume checks if the path is in a volume. If it is, it
4+
// cannot be in a read-only volume. If it is not in a volume, the container
5+
// cannot be configured with a read-only rootfs.
6+
//
7+
// This is a no-op on Windows which does not support volumes.
8+
func checkIfPathIsInAVolume(container *Container, absPath string) (bool, error) {
9+
return false, nil
10+
}

‎daemon/config.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ type CommonConfig struct {
1717
AutoRestart bool
1818
Bridge bridgeConfig // Bridge holds bridge network specific configuration.
1919
Context map[string][]string
20-
CorsHeaders string
2120
DisableBridge bool
2221
Dns []string
2322
DnsSearch []string
24-
EnableCors bool
2523
ExecDriver string
2624
ExecOptions []string
2725
ExecRoot string
@@ -51,8 +49,6 @@ func (config *Config) InstallCommonFlags(cmd *flag.FlagSet, usageFn func(string)
5149
cmd.StringVar(&config.GraphDriver, []string{"s", "-storage-driver"}, "", usageFn("Storage driver to use"))
5250
cmd.StringVar(&config.ExecDriver, []string{"e", "-exec-driver"}, defaultExec, usageFn("Exec driver to use"))
5351
cmd.IntVar(&config.Mtu, []string{"#mtu", "-mtu"}, 0, usageFn("Set the containers network MTU"))
54-
cmd.BoolVar(&config.EnableCors, []string{"#api-enable-cors", "#-api-enable-cors"}, false, usageFn("Enable CORS headers in the remote API, this is deprecated by --api-cors-header"))
55-
cmd.StringVar(&config.CorsHeaders, []string{"-api-cors-header"}, "", usageFn("Set CORS headers in the remote API"))
5652
// FIXME: why the inconsistency between "hosts" and "sockets"?
5753
cmd.Var(opts.NewListOptsRef(&config.Dns, opts.ValidateIPAddress), []string{"#dns", "-dns"}, usageFn("DNS server to use"))
5854
cmd.Var(opts.NewListOptsRef(&config.DnsSearch, opts.ValidateDNSSearch), []string{"-dns-search"}, usageFn("DNS search domains to use"))

‎daemon/config_linux.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ type Config struct {
2222

2323
// Fields below here are platform specific.
2424

25+
CorsHeaders string
26+
EnableCors bool
2527
EnableSelinuxSupport bool
2628
SocketGroup string
2729
Ulimits map[string]*ulimit.Ulimit
@@ -71,6 +73,8 @@ func (config *Config) InstallFlags(cmd *flag.FlagSet, usageFn func(string) strin
7173
cmd.BoolVar(&config.Bridge.InterContainerCommunication, []string{"#icc", "-icc"}, true, usageFn("Enable inter-container communication"))
7274
cmd.Var(opts.NewIpOpt(&config.Bridge.DefaultIP, "0.0.0.0"), []string{"#ip", "-ip"}, usageFn("Default IP when binding container ports"))
7375
cmd.BoolVar(&config.Bridge.EnableUserlandProxy, []string{"-userland-proxy"}, true, usageFn("Use userland proxy for loopback traffic"))
76+
cmd.BoolVar(&config.EnableCors, []string{"#api-enable-cors", "#-api-enable-cors"}, false, usageFn("Enable CORS headers in the remote API, this is deprecated by --api-cors-header"))
77+
cmd.StringVar(&config.CorsHeaders, []string{"-api-cors-header"}, "", usageFn("Set CORS headers in the remote API"))
7478

7579
config.attachExperimentalFlags(cmd, usageFn)
7680
}

‎daemon/container.go‎

Lines changed: 5 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,18 @@ type CommonContainer struct {
6464
Config *runconfig.Config
6565
ImageID string `json:"Image"`
6666
NetworkSettings *network.Settings
67-
ResolvConfPath string
68-
HostnamePath string
69-
HostsPath string
7067
LogPath string
7168
Name string
7269
Driver string
7370
ExecDriver string
7471
MountLabel, ProcessLabel string
7572
RestartCount int
76-
UpdateDns bool
7773
HasBeenStartedBefore bool
78-
79-
MountPoints map[string]*mountPoint
80-
Volumes map[string]string // Deprecated since 1.7, kept for backwards compatibility
81-
VolumesRW map[string]bool // Deprecated since 1.7, kept for backwards compatibility
82-
83-
hostConfig *runconfig.HostConfig
84-
command *execdriver.Command
85-
86-
monitor *containerMonitor
87-
execCommands *execStore
88-
daemon *Daemon
74+
hostConfig *runconfig.HostConfig
75+
command *execdriver.Command
76+
monitor *containerMonitor
77+
execCommands *execStore
78+
daemon *Daemon
8979
// logDriver for closing
9080
logDriver logger.Logger
9181
logCopier *logger.Copier
@@ -1076,94 +1066,6 @@ func copyEscapable(dst io.Writer, src io.ReadCloser) (written int64, err error)
10761066
return written, err
10771067
}
10781068

1079-
func (container *Container) networkMounts() []execdriver.Mount {
1080-
var mounts []execdriver.Mount
1081-
if container.ResolvConfPath != "" {
1082-
label.SetFileLabel(container.ResolvConfPath, container.MountLabel)
1083-
mounts = append(mounts, execdriver.Mount{
1084-
Source: container.ResolvConfPath,
1085-
Destination: "/etc/resolv.conf",
1086-
Writable: !container.hostConfig.ReadonlyRootfs,
1087-
Private: true,
1088-
})
1089-
}
1090-
if container.HostnamePath != "" {
1091-
label.SetFileLabel(container.HostnamePath, container.MountLabel)
1092-
mounts = append(mounts, execdriver.Mount{
1093-
Source: container.HostnamePath,
1094-
Destination: "/etc/hostname",
1095-
Writable: !container.hostConfig.ReadonlyRootfs,
1096-
Private: true,
1097-
})
1098-
}
1099-
if container.HostsPath != "" {
1100-
label.SetFileLabel(container.HostsPath, container.MountLabel)
1101-
mounts = append(mounts, execdriver.Mount{
1102-
Source: container.HostsPath,
1103-
Destination: "/etc/hosts",
1104-
Writable: !container.hostConfig.ReadonlyRootfs,
1105-
Private: true,
1106-
})
1107-
}
1108-
return mounts
1109-
}
1110-
1111-
func (container *Container) addBindMountPoint(name, source, destination string, rw bool) {
1112-
container.MountPoints[destination] = &mountPoint{
1113-
Name: name,
1114-
Source: source,
1115-
Destination: destination,
1116-
RW: rw,
1117-
}
1118-
}
1119-
1120-
func (container *Container) addLocalMountPoint(name, destination string, rw bool) {
1121-
container.MountPoints[destination] = &mountPoint{
1122-
Name: name,
1123-
Driver: volume.DefaultDriverName,
1124-
Destination: destination,
1125-
RW: rw,
1126-
}
1127-
}
1128-
1129-
func (container *Container) addMountPointWithVolume(destination string, vol volume.Volume, rw bool) {
1130-
container.MountPoints[destination] = &mountPoint{
1131-
Name: vol.Name(),
1132-
Driver: vol.DriverName(),
1133-
Destination: destination,
1134-
RW: rw,
1135-
Volume: vol,
1136-
}
1137-
}
1138-
1139-
func (container *Container) isDestinationMounted(destination string) bool {
1140-
return container.MountPoints[destination] != nil
1141-
}
1142-
1143-
func (container *Container) prepareMountPoints() error {
1144-
for _, config := range container.MountPoints {
1145-
if len(config.Driver) > 0 {
1146-
v, err := createVolume(config.Name, config.Driver)
1147-
if err != nil {
1148-
return err
1149-
}
1150-
config.Volume = v
1151-
}
1152-
}
1153-
return nil
1154-
}
1155-
1156-
func (container *Container) removeMountPoints() error {
1157-
for _, m := range container.MountPoints {
1158-
if m.Volume != nil {
1159-
if err := removeVolume(m.Volume); err != nil {
1160-
return err
1161-
}
1162-
}
1163-
}
1164-
return nil
1165-
}
1166-
11671069
func (container *Container) shouldRestart() bool {
11681070
return container.hostConfig.RestartPolicy.Name == "always" ||
11691071
(container.hostConfig.RestartPolicy.Name == "on-failure" && container.ExitCode != 0)

0 commit comments

Comments
 (0)