upstream/terraform-provider-docker
1
0
Fork 0
mirror of https://github.com/kreuzwerker/terraform-provider-docker.git synced 2025-12-23 08:09:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: adds container working dir (#181)

Browse source 
Closes #146
This commit is contained in:
Manuel Vogel 2019-09-23 19:41:20 +02:00 committed by GitHub
parent 8d4a71be3d
commit 42031f27fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/resource_docker_container.go
View file

@ -163,7 +163,11 @@ func resourceDockerContainer() *schema.Resource {
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
}, },
"working_dir": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
"capabilities": { "capabilities": {
Type: schema.TypeSet, Type: schema.TypeSet,
Optional: true, Optional: true,

4
docker/resource_docker_container_funcs.go
View file

@ -76,7 +76,9 @@ func resourceDockerContainerCreate(d *schema.ResourceData, meta interface{}) err
if len(exposedPorts) != 0 { if len(exposedPorts) != 0 {
config.ExposedPorts = exposedPorts config.ExposedPorts = exposedPorts
} }
if v, ok := d.GetOk("working_dir"); ok {
config.WorkingDir = v.(string)
}
extraHosts := []string{} extraHosts := []string{}
if v, ok := d.GetOk("host"); ok { if v, ok := d.GetOk("host"); ok {
extraHosts = extraHostsSetToDockerExtraHosts(v.(*schema.Set)) extraHosts = extraHostsSetToDockerExtraHosts(v.(*schema.Set))

4
docker/resource_docker_container_test.go
View file

@ -451,6 +451,9 @@ func TestAccDockerContainer_customized(t *testing.T) {
if c.HostConfig.UsernsMode != "testuser:231072:65536" { if c.HostConfig.UsernsMode != "testuser:231072:65536" {
return fmt.Errorf("Container doesn't have a correct userns mode") return fmt.Errorf("Container doesn't have a correct userns mode")
} }
if c.Config.WorkingDir != "/tmp" {
return fmt.Errorf("Container doesn't have a correct working dir")
}
return nil return nil
} }
@ -1432,6 +1435,7 @@ resource "docker_container" "foo" {
pid_mode = "host" pid_mode = "host"
userns_mode = "testuser:231072:65536" userns_mode = "testuser:231072:65536"
working_dir = "/tmp"
} }
resource "docker_network" "test_network" { resource "docker_network" "test_network" {

1
website/docs/r/container.html.markdown
View file

@ -65,6 +65,7 @@ data is stored in them. See [the docker documentation][linkdoc] for more details
one of "no", "on-failure", "always", "unless-stopped". one of "no", "on-failure", "always", "unless-stopped".
* `max_retry_count` - (Optional, int) The maximum amount of times to an attempt * `max_retry_count` - (Optional, int) The maximum amount of times to an attempt
a restart when `restart` is set to "on-failure" a restart when `restart` is set to "on-failure"
* `working_dir`- (Optional, string) The working directory for commands to run in
* `rm` - (Optional, bool) If true, then the container will be automatically removed after his execution. Terraform * `rm` - (Optional, bool) If true, then the container will be automatically removed after his execution. Terraform
won't check this container after creation. won't check this container after creation.
* `start` - (Optional, bool) If true, then the Docker container will be * `start` - (Optional, bool) If true, then the Docker container will be