rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #917 from joshwget/proxy-settings

Browse Source 
HTTP proxy settings can be set in cloud config
This commit is contained in:
Darren Shepherd
2016-05-07 12:56:52 -07:00
parent 3c8559a576 ae543ab167
commit a9ca80d47d
11 changed files with 238 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
init/init.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/rancher/docker-from-scratch"
"github.com/rancher/os/config"
"github.com/rancher/os/util"
"github.com/rancher/os/util/network"
)
const (
@@ -223,6 +224,10 @@ func RunInit() error {
func(c *config.CloudConfig) (*config.CloudConfig, error) {
return c, dockerlaunch.PrepareFs(&mountConfig)
},
func(c *config.CloudConfig) (*config.CloudConfig, error) {
network.SetProxyEnvironmentVariables(c)
return c, nil
},
initializeSelinux,
func(c *config.CloudConfig) (*config.CloudConfig, error) {
return c, syscall.Mount("", "/", "", syscall.MS_SHARED|syscall.MS_REC, "")