Skip to content

Commit

Permalink
remove docker plugin from bundled plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
azr committed Nov 3, 2021
1 parent 7a21f14 commit 4efa69c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
10 changes: 0 additions & 10 deletions command/vendored_plugins.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ import (
convergeprovisioner "github.com/hashicorp/packer-plugin-converge/provisioner/converge"
digitaloceanbuilder "github.com/hashicorp/packer-plugin-digitalocean/builder/digitalocean"
digitaloceanimportpostprocessor "github.com/hashicorp/packer-plugin-digitalocean/post-processor/digitalocean-import"
dockerbuilder "github.com/hashicorp/packer-plugin-docker/builder/docker"
dockerimportpostprocessor "github.com/hashicorp/packer-plugin-docker/post-processor/docker-import"
dockerpushpostprocessor "github.com/hashicorp/packer-plugin-docker/post-processor/docker-push"
dockersavepostprocessor "github.com/hashicorp/packer-plugin-docker/post-processor/docker-save"
dockertagpostprocessor "github.com/hashicorp/packer-plugin-docker/post-processor/docker-tag"
googlecomputebuilder "github.com/hashicorp/packer-plugin-googlecompute/builder/googlecompute"
googlecomputeexportpostprocessor "github.com/hashicorp/packer-plugin-googlecompute/post-processor/googlecompute-export"
googlecomputeimportpostprocessor "github.com/hashicorp/packer-plugin-googlecompute/post-processor/googlecompute-import"
Expand Down Expand Up @@ -73,7 +68,6 @@ var VendoredBuilders = map[string]packersdk.Builder{
"alicloud-ecs": new(alicloudecsbuilder.Builder),
"cloudstack": new(cloudstackbuilder.Builder),
"digitalocean": new(digitaloceanbuilder.Builder),
"docker": new(dockerbuilder.Builder),
"googlecompute": new(googlecomputebuilder.Builder),
"hcloud": new(hcloudbuilder.Builder),
"hyperv-iso": new(hypervisobuilder.Builder),
Expand Down Expand Up @@ -125,10 +119,6 @@ var VendoredProvisioners = map[string]packersdk.Provisioner{
var VendoredPostProcessors = map[string]packersdk.PostProcessor{
"alicloud-import": new(alicloudimportpostprocessor.PostProcessor),
"digitalocean-import": new(digitaloceanimportpostprocessor.PostProcessor),
"docker-import": new(dockerimportpostprocessor.PostProcessor),
"docker-push": new(dockerpushpostprocessor.PostProcessor),
"docker-save": new(dockersavepostprocessor.PostProcessor),
"docker-tag": new(dockertagpostprocessor.PostProcessor),
"googlecompute-export": new(googlecomputeexportpostprocessor.PostProcessor),
"googlecompute-import": new(googlecomputeimportpostprocessor.PostProcessor),
"ucloud-import": new(ucloudimportpostprocessor.PostProcessor),
Expand Down
10 changes: 5 additions & 5 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ func loadConfig() (*config, error) {
"azure-chroot": "github.com/hashicorp/azure",
"azure-dtl": "github.com/hashicorp/azure",

// "docker": "github.com/hashicorp/docker",
"docker": "github.com/hashicorp/docker",

"exoscale": "github.com/exoscale/exoscale",
// "googlecompute": "github.com/hashicorp/googlecompute",
Expand Down Expand Up @@ -371,10 +371,10 @@ func loadConfig() (*config, error) {
PostProcessorRedirects: map[string]string{
"amazon-import": "github.com/hashicorp/amazon",

// "docker-import": "github.com/hashicorp/docker",
// "docker-push": "github.com/hashicorp/docker",
// "docker-save": "github.com/hashicorp/docker",
// "docker-tag": "github.com/hashicorp/docker",
"docker-import": "github.com/hashicorp/docker",
"docker-push": "github.com/hashicorp/docker",
"docker-save": "github.com/hashicorp/docker",
"docker-tag": "github.com/hashicorp/docker",

// "googlecompute-export": "github.com/hashicorp/googlecompute",
// "googlecompute-import": "github.com/hashicorp/googlecompute",
Expand Down

0 comments on commit 4efa69c

Please sign in to comment.