Skip to content

Commit

Permalink
Remove SSL
Browse files Browse the repository at this point in the history
  • Loading branch information
dadgar committed Jan 12, 2017
1 parent 16a2478 commit b93d03b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
4 changes: 0 additions & 4 deletions client/driver/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ type DockerDriverConfig struct {
LabelsRaw []map[string]string `mapstructure:"labels"` //
Labels map[string]string `mapstructure:"-"` // Labels to set when the container starts up
Auth []DockerDriverAuth `mapstructure:"auth"` // Authentication credentials for a private Docker registry
SSL bool `mapstructure:"ssl"` // Flag indicating repository is served via https
TTY bool `mapstructure:"tty"` // Allocate a Pseudo-TTY
Interactive bool `mapstructure:"interactive"` // Keep STDIN open even if not attached
ShmSize int64 `mapstructure:"shm_size"` // Size of /dev/shm of the container in bytes
Expand Down Expand Up @@ -161,9 +160,6 @@ func (c *DockerDriverConfig) Validate() error {
func NewDockerDriverConfig(task *structs.Task, env *env.TaskEnvironment) (*DockerDriverConfig, error) {
var dconf DockerDriverConfig

// Default to SSL
dconf.SSL = true

if err := mapstructure.WeakDecode(task.Config, &dconf); err != nil {
return nil, err
}
Expand Down
3 changes: 0 additions & 3 deletions website/source/docs/drivers/docker.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ The `docker` driver supports the following configuration in the job spec:
* `dns_search_domains` - (Optional) A list of DNS search domains for the container
to use.
* `SSL` - (Optional) If this is set to true, Nomad uses SSL to talk to the
repository. The default value is `true`.
* `port_map` - (Optional) A key-value map of port labels (see below).
* `auth` - (Optional) Provide authentication for a private registry (see below).
Expand Down

0 comments on commit b93d03b

Please sign in to comment.