Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

containers: Adjust label commands in cockpit/ws Dockerfile to follow man page example #15783

Merged
merged 1 commit into from
May 4, 2021

Conversation

KKoukiou
Copy link
Contributor

@KKoukiou KKoukiou commented May 3, 2021

The label commands where adjusted to contain IMAGE and NAME as env variables.
With newer podman, these are apparently just passed into the environment of the
docker run call itself, instead of being string-substituted on the command line.

See containers/podman#10192

…man page example

The label commands where adjusted to contain IMAGE and NAME as env variables.
With newer podman, these are apparently just passed into the environment of the
docker run call itself, instead of being string-substituted on the command line.

See containers/podman#10192
@KKoukiou
Copy link
Contributor Author

KKoukiou commented May 3, 2021

I built the container locally and ran the runlabel command:

$ podman container runlabel install cockpit/ws
cockpit-ws must not be installed in the host
Error: `/proc/self/exe run --rm --privileged -v /:/host -e IMAGE=quay.io/cockpit/ws:latest quay.io/cockpit/ws:latest /container/atomic-install quay.io/cockpit/ws:latest` failed: exit status 1

Seems the the IMAGE, NAME are replaced correctly.

Copy link
Member

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

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

Thanks! Makes me wonder if we could replace the /usr/bin/docker with something that works for podman as well? It seems it already substitutes it with /proc/self/exe, but it still looks odd.

@martinpitt martinpitt merged commit c73ee0b into cockpit-project:master May 4, 2021
@KKoukiou KKoukiou deleted the container-runlabel branch May 4, 2021 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants