diff options
| -rw-r--r-- | docs/source/markdown/podman-auto-update.1.md | 5 | ||||
| -rw-r--r-- | docs/source/markdown/podman-generate-systemd.1.md | 2 | ||||
| -rw-r--r-- | test/e2e/images_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/prune_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/rmi_test.go | 1 |
5 files changed, 7 insertions, 5 deletions
diff --git a/docs/source/markdown/podman-auto-update.1.md b/docs/source/markdown/podman-auto-update.1.md index 219ac03b7..ad1e425aa 100644 --- a/docs/source/markdown/podman-auto-update.1.md +++ b/docs/source/markdown/podman-auto-update.1.md @@ -58,6 +58,11 @@ $ podman generate systemd --new --files bc219740a210455fa27deacc96d50a9e20516492 # Load the new systemd unit and start it $ mv ./container-bc219740a210455fa27deacc96d50a9e20516492f1417507c13ce1533dbdcd9d.service ~/.config/systemd/user $ systemctl --user daemon-reload + +# If the previously created containers or pods are using shared resources, such as ports, make sure to remove them before starting the generated systemd units. +$ podman stop bc219740a210455fa27deacc96d50a9e20516492f1417507c13ce1533dbdcd9d +$ podman rm bc219740a210455fa27deacc96d50a9e20516492f1417507c13ce1533dbdcd9d + $ systemctl --user start container-bc219740a210455fa27deacc96d50a9e20516492f1417507c13ce1533dbdcd9d.service # Auto-update the container diff --git a/docs/source/markdown/podman-generate-systemd.1.md b/docs/source/markdown/podman-generate-systemd.1.md index 032158c56..a59dbc7f0 100644 --- a/docs/source/markdown/podman-generate-systemd.1.md +++ b/docs/source/markdown/podman-generate-systemd.1.md @@ -189,6 +189,8 @@ Create and enable systemd unit files for a pod using the above examples as refer Since systemctl defaults to using the root user, all the changes using the systemctl can be seen by appending sudo to the podman cli commands. To perform `systemctl` actions as a non-root user use the `--user` flag when interacting with `systemctl`. +Note: If the previously created containers or pods are using shared resources, such as ports, make sure to remove them before starting the generated systemd units. + ``` $ systemctl --user start pod-systemd-pod.service $ podman pod ps diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 2dab4858e..7c0d1cf78 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -319,7 +319,6 @@ WORKDIR /test }) It("podman images --all flag", func() { - SkipIfRemote("FIXME This should work on podman-remote, problem is with podman-remote build") dockerfile := `FROM quay.io/libpod/alpine:latest RUN mkdir hello RUN touch test.txt @@ -350,7 +349,6 @@ LABEL "com.example.vendor"="Example Vendor" }) It("podman with images with no layers", func() { - SkipIfRemote("FIXME This should work on podman-remote, problem is with podman-remote build") dockerfile := strings.Join([]string{ `FROM scratch`, `LABEL org.opencontainers.image.authors="<somefolks@example.org>"`, diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 3bc1012df..f84312103 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -88,7 +88,6 @@ var _ = Describe("Podman prune", func() { }) It("podman image prune skip cache images", func() { - SkipIfRemote("FIXME: podman-remote build is not working the same as local build") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") none := podmanTest.Podman([]string{"images", "-a"}) @@ -110,7 +109,6 @@ var _ = Describe("Podman prune", func() { }) It("podman image prune dangling images", func() { - SkipIfRemote("FIXME: podman-remote build is not working the same as local build") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 1f40e4928..4833a282e 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -181,7 +181,6 @@ var _ = Describe("Podman rmi", func() { }) It("podman rmi with cached images", func() { - SkipIfRemote("FIXME This should work on podman-remote, problem is with podman-remote build") podmanTest.AddImageToRWStore(cirros) dockerfile := `FROM quay.io/libpod/cirros:latest RUN mkdir hello |