Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions internal/provider/resource_docker_image.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package provider

import (
"context"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

Expand All @@ -10,6 +12,12 @@ func resourceDockerImage() *schema.Resource {
ReadContext: resourceDockerImageRead,
UpdateContext: resourceDockerImageUpdate,
DeleteContext: resourceDockerImageDelete,
Importer: &schema.ResourceImporter{
StateContext: func(_ context.Context, d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
d.Set("name", d.Id())
return []*schema.ResourceData{d}, nil
},
},

Schema: map[string]*schema.Schema{
"name": {
Expand Down
7 changes: 3 additions & 4 deletions internal/provider/resource_docker_image_funcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,11 @@ func resourceDockerImageCreate(ctx context.Context, d *schema.ResourceData, meta
}
}
}
apiImage, err := findImage(ctx, imageName, client, meta.(*ProviderConfig).AuthConfigs)
if err != nil {
if _, err := findImage(ctx, imageName, client, meta.(*ProviderConfig).AuthConfigs); err != nil {
return diag.Errorf("Unable to read Docker image into resource: %s", err)
}

d.SetId(apiImage.ID + d.Get("name").(string))
d.SetId(imageName)
return resourceDockerImageRead(ctx, d, meta)
}

Expand All @@ -94,7 +93,7 @@ func resourceDockerImageRead(ctx context.Context, d *schema.ResourceData, meta i
return nil
}

d.SetId(foundImage.ID + d.Get("name").(string))
d.SetId(imageName)
d.Set("latest", foundImage.ID)
return nil
}
Expand Down
8 changes: 8 additions & 0 deletions website/docs/r/image.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,11 @@ The `build` block supports:
The following attributes are exported in addition to the above configuration:

* `latest` (string) - The ID of the image.

## Import

Docker images can be imported using image name, e.g. for an image named `alpine:3.13.0`:

```sh
$ terraform import docker_image.alpine alpine:3.13.0
```