diff options
| author | Joseph Benden <joe@benden.us> | 2021-06-10 17:09:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 17:09:05 +0200 |
| commit | 003c995b36b09d8e878d28ce6ff7cfe8e05e89ae (patch) | |
| tree | 30123c04e302d387e11712a918808773bc562eca /cmd | |
| parent | fix: wrong perms (#726) (diff) | |
| download | forgejo-act-003c995b36b09d8e878d28ce6ff7cfe8e05e89ae.tar.xz forgejo-act-003c995b36b09d8e878d28ce6ff7cfe8e05e89ae.zip | |
Support container removal at exit. Fixes #694 (#714)
This patch adds a new command-line flag (`--rm`) to automatically
stop workflow container(s), just prior to exit. The default
behavior is kept, e.g.: the containers continue running at exit.
Fixes: #694
Signed-off-by: Joseph Benden <joe@benden.us>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/input.go | 1 | ||||
| -rw-r--r-- | cmd/root.go | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmd/input.go b/cmd/input.go index 6cde2f0..164d848 100644 --- a/cmd/input.go +++ b/cmd/input.go @@ -34,6 +34,7 @@ type Input struct { githubInstance string containerCapAdd []string containerCapDrop []string + autoRemove bool } func (i *Input) resolve(path string) string { diff --git a/cmd/root.go b/cmd/root.go index bfde168..25f2b82 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -52,6 +52,7 @@ func Execute(ctx context.Context, version string) { rootCmd.Flags().BoolVar(&input.useGitIgnore, "use-gitignore", true, "Controls whether paths specified in .gitignore should be copied into container") rootCmd.Flags().StringArrayVarP(&input.containerCapAdd, "container-cap-add", "", []string{}, "kernel capabilities to add to the workflow containers (e.g. --container-cap-add SYS_PTRACE)") rootCmd.Flags().StringArrayVarP(&input.containerCapDrop, "container-cap-drop", "", []string{}, "kernel capabilities to remove from the workflow containers (e.g. --container-cap-drop SYS_PTRACE)") + rootCmd.Flags().BoolVar(&input.autoRemove, "rm", false, "automatically remove containers just before exit") rootCmd.PersistentFlags().StringVarP(&input.actor, "actor", "a", "nektos/act", "user that triggered the event") rootCmd.PersistentFlags().StringVarP(&input.workflowsPath, "workflows", "W", "./.github/workflows/", "path to workflow file(s)") rootCmd.PersistentFlags().BoolVarP(&input.noWorkflowRecurse, "no-recurse", "", false, "Flag to disable running workflows from subdirectories of specified path in '--workflows'/'-W' flag") @@ -263,6 +264,7 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str GitHubInstance: input.githubInstance, ContainerCapAdd: input.containerCapAdd, ContainerCapDrop: input.containerCapDrop, + AutoRemove: input.autoRemove, } r, err := runner.New(config) if err != nil { |