bootstrap-containers: prevent bootstrap containers from restarting #1508
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Aren't some bootstrap containers intended to run on every boot? Would this prevent that behavior? |
bcressey
approved these changes
Apr 21, 2021
|
|
||
| [Service] | ||
| Type=oneshot | ||
| EnvironmentFile=/etc/bootstrap-containers/%i.env | ||
| # Create a sentinel file to mark that we've ran | ||
| ExecStart=/usr/bin/mkdir -p /run/bootstrap-containers/ |
There was a problem hiding this comment.
nit: I have a slight preference to do this mkdir via bootstrap-containers-tmpfiles.conf so we don't repeat the work for N bootstrap containers.
| @@ -7,10 +7,17 @@ Wants=host-containers.service | |||
| # started by systemd | |||
| RefuseManualStart=true | |||
| RefuseManualStop=true | |||
| # If a sentinel file exists for this bootstrap container, it means we should skip | |||
| # since we've ran this bootstrap container already. | |||
There was a problem hiding this comment.
nit: wording
Suggested change
| # since we've ran this bootstrap container already. | |
| # since we've run this bootstrap container already. |
The tracking file is in |
|
Nit: In your commit message: Should be "create". |
arnaldo2792
approved these changes
Apr 21, 2021
etungsten
force-pushed
the
bootstrap-container-inits
branch
from
fd9b40b
to
6075474
Compare
|
Push above addresses comments by @arnaldo2792 and @bcressey Tested things and they still work as expected. |
bootstrap-containers@ units create a sentinel file when they first run. If the sentinel file exists, the unit will be skipped over. This will prevent non-essential bootstrap-containers from being restarted by systemd when multi-user.target is reached.
etungsten
force-pushed
the
bootstrap-container-inits
branch
from
6075474
to
2f1530a
Compare
|
Push above fixes another grammar error. English is hard. |
webern
approved these changes
Apr 21, 2021
bcressey
approved these changes
Apr 22, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
Fixes #1488
Description of changes:
Testing done:
I launched an instance with the following in my userdata:
The instance comes up find. The host reaches
multi-user.targetsuccessfully.All target units are active at the end. The bootstrap container unit statuses are as expected.
bootstrap-containers@bear:
bootstrap-containers@test:
The invalid bootstrap container is only started once then skipped over when
activate-multi-user.serviceruns.journal:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.