diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-23 15:14:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-23 15:14:10 +0100 |
| commit | 5570b5b9751894d509be2b478685097cf8fde923 (patch) | |
| tree | 69c520e6e114309c69bd2c1e2a73736de675a74f /pkg/specgen | |
| parent | a7f1c05366c86a05e247049f8837b4aadc54fc50 (diff) | |
| parent | 1aa4e4d4d183aa07ea7453e4be70d31eaa8edb13 (diff) | |
| download | podman-5570b5b9751894d509be2b478685097cf8fde923.tar.gz podman-5570b5b9751894d509be2b478685097cf8fde923.tar.bz2 podman-5570b5b9751894d509be2b478685097cf8fde923.zip | |
Merge pull request #12679 from vrothberg/fix-12671
clarify `io.podman.annotations.seccomp`
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/container.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 40a18a6ac..57676db10 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -156,7 +156,9 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat // Add annotations from the image for k, v := range inspectData.Annotations { - annotations[k] = v + if !define.IsReservedAnnotation(k) { + annotations[k] = v + } } } |