summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Kraus <neverberlerfellerer@gmail.com>2020-05-12 13:09:11 +0200
committerOndřej Kraus <neverberlerfellerer@gmail.com>2020-05-17 11:37:12 +0200
commit9177c89eddb0b7e392c60614eb30073bd7859401 (patch)
tree4e9867059407f3a4e3a2248ae283118ebb9a93e9
parent343ab99b39771b5084a231a2db8d3dc969f395f9 (diff)
downloadpodman-9177c89eddb0b7e392c60614eb30073bd7859401.tar.gz
podman-9177c89eddb0b7e392c60614eb30073bd7859401.tar.bz2
podman-9177c89eddb0b7e392c60614eb30073bd7859401.zip
Give `auto-update` ability to use per-container authfile specified by label.
Signed-off-by: Ondřej Kraus <neverberlerfellerer@gmail.com>
-rw-r--r--docs/source/markdown/podman-auto-update.1.md6
-rw-r--r--pkg/autoupdate/autoupdate.go9
2 files changed, 14 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-auto-update.1.md b/docs/source/markdown/podman-auto-update.1.md
index f98b71420..435a767c1 100644
--- a/docs/source/markdown/podman-auto-update.1.md
+++ b/docs/source/markdown/podman-auto-update.1.md
@@ -13,6 +13,8 @@ If the label is present and set to "image", Podman reaches out to the correspond
An image is considered updated if the digest in the local storage is different than the one of the remote image.
If an image must be updated, Podman pulls it down and restarts the systemd unit executing the container.
+If "io.containers.autoupdate.authfile" label is present, Podman reaches out to corresponding authfile when pulling images.
+
At container-creation time, Podman looks up the "PODMAN_SYSTEMD_UNIT" environment variables and stores it verbatim in the container's label.
This variable is now set by all systemd units generated by `podman-generate-systemd` and is set to `%n` (i.e., the name of systemd unit starting the container).
This data is then being used in the auto-update sequence to instruct systemd (via DBUS) to restart the unit and hence to restart the container.
@@ -35,7 +37,9 @@ environment variable. `export REGISTRY_AUTH_FILE=path`
```
# Start a container
-$ podman run --label "io.containers.autoupdate=image" -d busybox:latest top
+$ podman run --label "io.containers.autoupdate=image" \
+ --label "io.containers.autoupdate.autfile=/some/authfile.json" \
+ -d busybox:latest top
bc219740a210455fa27deacc96d50a9e20516492f1417507c13ce1533dbdcd9d
# Generate a systemd unit for this container
diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go
index 1b0419892..eca5c342c 100644
--- a/pkg/autoupdate/autoupdate.go
+++ b/pkg/autoupdate/autoupdate.go
@@ -23,6 +23,10 @@ import (
// container labels.
const Label = "io.containers.autoupdate"
+// Label denotes the container label key to specify authfile in
+// container labels.
+const AuthfileLabel = "io.containers.autoupdate.authfile"
+
// Policy represents an auto-update policy.
type Policy string
@@ -144,6 +148,11 @@ func AutoUpdate(runtime *libpod.Runtime, options Options) ([]string, []error) {
if rawImageName == "" {
errs = append(errs, errors.Errorf("error auto-updating container %q: raw-image name is empty", ctr.ID()))
}
+ labels := ctr.Labels()
+ authFilePath, exists := labels[AuthfileLabel]
+ if exists {
+ options.Authfile = authFilePath
+ }
needsUpdate, err := newerImageAvailable(runtime, image, rawImageName, options)
if err != nil {
errs = append(errs, errors.Wrapf(err, "error auto-updating container %q: image check for %q failed", ctr.ID(), rawImageName))