Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.03] Fix --label behavior on run#446

Closed
vdemeester wants to merge 1 commit intodocker-archive:18.03from
vdemeester:backport-fix-run-label-flag-behavior
Closed

[18.03] Fix --label behavior on run#446
vdemeester wants to merge 1 commit intodocker-archive:18.03from
vdemeester:backport-fix-run-label-flag-behavior

Conversation

@vdemeester
Copy link
Copy Markdown
Contributor

backport of:

docker/cli#904 Fix `--label` behavior on run

with cherry-pick of git commit docker/cli@31dc5c0:

$ git cherry-pick -s -x -Xsubtree=components/cli 31dc5c0

no conflicts.

Commit 2b17f4c8a8caad552025edb05a73db683fb8a5c6 fixed the way empty labels
are taken into account (i.e. not interpolated from environment variable),
but it created a regression.

`ValidateLabel` functions doesn't allow empty label value, but it has
always been possible to pass an empty label via the cli (`docker run --label foo`).

This fixes that by not validating the label flag.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 31dc5c0a9a8bdc11c7ad335aebb753ed527caa5a)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Copy Markdown
Member

Backport of docker/cli#904

@jose-bigio jose-bigio added this to the 18.03.0 milestone Feb 28, 2018
@vdemeester
Copy link
Copy Markdown
Contributor Author

Closing this one in favor of #447 that fixes the tests with this backport too 😉

@vdemeester vdemeester closed this Mar 2, 2018
docker-jenkins pushed a commit that referenced this pull request Jan 23, 2020
[19.03 backport] builder-next: close build context upload on cancel
Upstream-commit: 60220a48b26ca96928efcd6222bc8e4b0d254b1b
Component: engine
docker-jenkins pushed a commit that referenced this pull request Mar 26, 2020
CentOS: fix failing repository on aarch64 (arm64)
Upstream-commit: ac9bcdf
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
CentOS: fix failing repository on aarch64 (arm64)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants