aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/runner.sh4
-rw-r--r--contrib/snapcraft/snap/snapcraft.yaml2
-rw-r--r--contrib/systemd/system/podman-kube@.service.in1
3 files changed, 2 insertions, 5 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 35ecfd4ff..6b2d123f2 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -398,9 +398,7 @@ dotest() {
}
_run_machine() {
- # TODO: This is a manually-triggered task, if that ever changes need to
- # add something like:
- # _bail_if_test_can_be_skipped docs test/e2e test/system test/python
+ # N/B: Can't use _bail_if_test_can_be_skipped here b/c content isn't under test/
make localmachine |& logformatter
}
diff --git a/contrib/snapcraft/snap/snapcraft.yaml b/contrib/snapcraft/snap/snapcraft.yaml
index 57589b00e..a7f7d09b6 100644
--- a/contrib/snapcraft/snap/snapcraft.yaml
+++ b/contrib/snapcraft/snap/snapcraft.yaml
@@ -17,7 +17,7 @@ parts:
source: https://github.com/containers/podman/archive/v0.11.1.1.tar.gz
go-importpath: github.com/containers/podman
build-packages:
- # https://github.com/containers/podman/blob/main/install.md#build-and-run-dependencies
+ # https://podman.io/getting-started/installation#build-and-run-dependencies
- btrfs-tools
- git
- golang-go
diff --git a/contrib/systemd/system/podman-kube@.service.in b/contrib/systemd/system/podman-kube@.service.in
index 824f71eb0..dac5da7cd 100644
--- a/contrib/systemd/system/podman-kube@.service.in
+++ b/contrib/systemd/system/podman-kube@.service.in
@@ -7,7 +7,6 @@ RequiresMountsFor=%t/containers
[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=never
TimeoutStopSec=70
ExecStart=@@PODMAN@@ play kube --replace --service-container=true %I
ExecStop=@@PODMAN@@ play kube --down %I