Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from hashicorp/ecr-pull-fixup
Browse files Browse the repository at this point in the history
Docs and changelog
  • Loading branch information
kmcgovern-apixio authored Jul 20, 2023
2 parents 5df7a40 + caca130 commit 6e0653a
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .changelog/4847.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
plugin/aws/ecr-pull: Support entrypoint injection in ecr-pull builder
```
11 changes: 11 additions & 0 deletions builtin/aws/ecr/pull/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
awsecr "github.com/aws/aws-sdk-go/service/ecr"
"github.com/aws/aws-sdk-go/service/lambda"

"github.com/hashicorp/waypoint-plugin-sdk/component"
"github.com/hashicorp/waypoint-plugin-sdk/docs"
"github.com/hashicorp/waypoint-plugin-sdk/terminal"
Expand Down Expand Up @@ -116,6 +117,16 @@ build {
docs.Default("`\"\"`"),
)

doc.SetField(
"disable_entrypoint",
"if set, the entrypoint binary won't be injected into the image",
docs.Summary(
"The entrypoint binary is what provides extended functionality",
"such as logs and exec. If it is not injected at build time",
"the expectation is that the image already contains it",
),
)

return doc, nil
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file was generated via `make gen/integrations-hcl`
parameter {
key = "disable_entrypoint"
description = ""
description = "if set, the entrypoint binary won't be injected into the image\nThe entrypoint binary is what provides extended functionality such as logs and exec. If it is not injected at build time the expectation is that the image already contains it"
type = "bool"
required = false
}
Expand Down
12 changes: 12 additions & 0 deletions embedJson/gen/builder-aws-ecr-pull.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
"mappers": null,
"name": "aws-ecr-pull",
"optionalFields": [
{
"Field": "disable_entrypoint",
"Type": "bool",
"Synopsis": "if set, the entrypoint binary won't be injected into the image",
"Summary": "The entrypoint binary is what provides extended functionality such as logs and exec. If it is not injected at build time the expectation is that the image already contains it",
"Optional": true,
"Default": "",
"EnvVar": "",
"Category": false,
"Example": "",
"SubFields": null
},
{
"Field": "force_architecture",
"Type": "string",
Expand Down
9 changes: 9 additions & 0 deletions website/content/partials/components/builder-aws-ecr-pull.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ The tag of the image to pull.

These parameters are used in the [`use` stanza](/waypoint/docs/waypoint-hcl/use) for this plugin.

#### disable_entrypoint

If set, the entrypoint binary won't be injected into the image.

The entrypoint binary is what provides extended functionality such as logs and exec. If it is not injected at build time the expectation is that the image already contains it.

- Type: **bool**
- **Optional**

#### force_architecture

**Note**: This is a temporary field that enables overriding the `architecture` output attribute. Valid values are: `"x86_64"`, `"arm64"`.
Expand Down

0 comments on commit 6e0653a

Please sign in to comment.