diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2020-09-14 10:19:07 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-09-15 10:14:34 +0200 |
| commit | d4bea54dfee2856f32f20876db234e778bf91e14 (patch) | |
| tree | a5d4aa17273850c767e439297d30c4d182b4a40a /contrib | |
| parent | b7a7cf65768eef79a185603cc3d1f56ce2053a9e (diff) | |
| download | podman-d4bea54dfee2856f32f20876db234e778bf91e14.tar.gz podman-d4bea54dfee2856f32f20876db234e778bf91e14.tar.bz2 podman-d4bea54dfee2856f32f20876db234e778bf91e14.zip | |
move `rootless-cni-infra` image to quay.io
Move the `rootless-cni-infra` image to `quay.io/libpod/rootless-cni-image:$tag`
where $tag has the format `$version-$architecture`. Whenever we upload
a new image (e.g., after changing the Containerfile), we need to make
sure to increase the version number (an ordinary integer for simplicity) so we
have a notion of support.
Thanks to @AkihiroSuda for working on rootless CNI!
Fixes: #7617
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/rootless-cni-infra/Containerfile | 2 | ||||
| -rw-r--r-- | contrib/rootless-cni-infra/README.md | 2 | ||||
| -rwxr-xr-x | contrib/rootless-cni-infra/rootless-cni-infra | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/contrib/rootless-cni-infra/Containerfile b/contrib/rootless-cni-infra/Containerfile index c5d812a6e..5be30ccc9 100644 --- a/contrib/rootless-cni-infra/Containerfile +++ b/contrib/rootless-cni-infra/Containerfile @@ -33,3 +33,5 @@ COPY --from=dnsname /dnsname /opt/cni/bin COPY rootless-cni-infra /usr/local/bin ENV CNI_PATH=/opt/cni/bin CMD ["sleep", "infinity"] + +ENV ROOTLESS_CNI_INFRA_VERSION=1 diff --git a/contrib/rootless-cni-infra/README.md b/contrib/rootless-cni-infra/README.md index 937e057fb..5aa13374b 100644 --- a/contrib/rootless-cni-infra/README.md +++ b/contrib/rootless-cni-infra/README.md @@ -16,6 +16,8 @@ Podman then allocates a CNI netns in the infra container, by executing an equiva The allocated netns is deallocated when the container is being removed, by executing an equivalent of: `podman exec rootless-cni-infra rootless-cni-infra dealloc $CONTAINER_ID $NETWORK_NAME`. +The container images live on `quay.io/libpod/rootless-cni-infra`. The tags have the format `$version-$architecture`. Please make sure to increase the version number in the Containerfile (i.e., `ROOTLESS_CNI_INFRA_VERSION`) when applying changes to this directory. After committing the changes, upload the image(s) with the corresponding tag. + ## Directory layout * `/run/rootless-cni-infra/${CONTAINER_ID}/pid`: PID of the `sleep infinity` process that corresponds to the allocated netns diff --git a/contrib/rootless-cni-infra/rootless-cni-infra b/contrib/rootless-cni-infra/rootless-cni-infra index 5a574d2eb..f6622b23c 100755 --- a/contrib/rootless-cni-infra/rootless-cni-infra +++ b/contrib/rootless-cni-infra/rootless-cni-infra @@ -2,7 +2,6 @@ set -eu ARG0="$0" -VERSION="0.1.0" BASE="/run/rootless-cni-infra" # CLI subcommand: "alloc $CONTAINER_ID $NETWORK_NAME $POD_NAME" @@ -126,7 +125,7 @@ cmd_entrypoint_help() { # CLI subcommand: "version" cmd_entrypoint_version() { - echo "{\"version\": \"${VERSION}\"}" + echo "{\"version\": \"${ROOTLESS_CNI_INFRA_VERSION}\"}" } # parse args |