Add PWD_HOST_FQDN env variable to instances.

zhiwei55 · Jun 14, 2017 · 8f24779 · 8f24779
1 parent fa275b8
commit 8f24779
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/docker/docker.go b/docker/docker.go
@@ -206,6 +206,7 @@ type CreateContainerOpts struct {
 	ServerKey     []byte
 	CACert        []byte
 	Privileged    bool
+	HostFQDN      string
 }
 
 func (d *docker) CreateContainer(opts CreateContainerOpts) (string, error) {
@@ -256,6 +257,7 @@ func (d *docker) CreateContainer(opts CreateContainerOpts) (string, error) {
 	h.Resources.OomKillDisable = &t
 
 	env = append(env, fmt.Sprintf("PWD_IP_ADDRESS=%s", opts.PwdIpAddress))
+	env = append(env, fmt.Sprintf("PWD_HOST_FQDN=%s", opts.HostFQDN))
 	cf := &container.Config{Hostname: opts.Hostname,
 		Image:        opts.Image,
 		Tty:          true,

diff --git a/handlers/new_instance.go b/handlers/new_instance.go
@@ -13,7 +13,7 @@ func NewInstance(rw http.ResponseWriter, req *http.Request) {
 	vars := mux.Vars(req)
 	sessionId := vars["sessionId"]
 
-	body := pwd.InstanceConfig{}
+	body := pwd.InstanceConfig{Host: req.Host}
 
 	json.NewDecoder(req.Body).Decode(&body)
 

diff --git a/pwd/instance.go b/pwd/instance.go
@@ -66,6 +66,7 @@ type InstanceConfig struct {
 	CACert     []byte
 	Cert       []byte
 	Key        []byte
+	Host       string
 }
 
 func (i *Instance) setUsedPort(port uint16) {
@@ -223,6 +224,7 @@ func (p *pwd) InstanceNew(session *Session, conf InstanceConfig) (*Instance, err
 		ServerKey:     conf.ServerKey,
 		CACert:        conf.CACert,
 		Privileged:    false,
+		HostFQDN:      conf.Host,
 	}
 
 	for _, imageName := range p.InstanceAllowedImages() {

diff --git a/pwd/instance_test.go b/pwd/instance_test.go
@@ -57,7 +57,7 @@ func TestInstanceNew(t *testing.T) {
 
 	assert.Nil(t, err)
 
-	instance, err := p.InstanceNew(session, InstanceConfig{})
+	instance, err := p.InstanceNew(session, InstanceConfig{Host: "something.play-with-docker.com"})
 
 	assert.Nil(t, err)
 
@@ -83,6 +83,7 @@ func TestInstanceNew(t *testing.T) {
 		ServerKey:     nil,
 		CACert:        nil,
 		Privileged:    true,
+		HostFQDN:      "something.play-with-docker.com",
 	}
 	assert.Equal(t, expectedContainerOpts, containerOpts)
 }