Skip to content

Commit b77e25d

Browse files
estespestesp
authored
Merge pull request #3516 from crosbymichael/remote-enc
Remove encryption code from containerd core
2 parents 95277fa + d085d9b commit b77e25d

101 files changed

Lines changed: 0 additions & 27005 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/ctr/commands/commands.go‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,22 +131,6 @@ var (
131131
Usage: "add a device to a container",
132132
},
133133
}
134-
// ImageDecryptionFlags are cli flags needed when decrypting an image
135-
ImageDecryptionFlags = []cli.Flag{
136-
cli.StringFlag{
137-
Name: "gpg-homedir",
138-
Usage: "The GPG homedir to use; by default gpg uses ~/.gnupg",
139-
}, cli.StringFlag{
140-
Name: "gpg-version",
141-
Usage: "The GPG version (\"v1\" or \"v2\"), default will make an educated guess",
142-
}, cli.StringSliceFlag{
143-
Name: "key",
144-
Usage: "A secret key's filename and an optional password separated by colon; this option may be provided multiple times",
145-
}, cli.StringSliceFlag{
146-
Name: "dec-recipient",
147-
Usage: "Recipient of the image; used only for PKCS7 and must be an x509 certificate",
148-
},
149-
}
150134
)
151135

152136
// ObjectWithLabelArgs returns the first arg and a LabelArgs object

0 commit comments

Comments
 (0)