feat: Add docker command

Author: twpayne

assets/chezmoi.io/docs/reference/commands/docker.md

@@ -0,0 +1,50 @@
+# `docker`
+
+!!! Warning
+
+    `docker` is an experimental command.
+
+Install chezmoi, run `chezmoi init --apply`, and optionally execute your shell
+in Docker containers.
+
+## Subcommands
+
+### `exec` *container-id* *init-args*...
+
+Install chezmoi, run `chezmoi init --apply *init-args*`, and execute your shell
+in the existing Docker container *container-id*.
+
+#### Flags
+
+#### `-i`, `--interactive`
+
+Keep stdin open even if not attached.
+
+#### `-p`, `--package`
+
+Install chezmoi using the distribution's package manager, if possible.
+Otherwise, fall back to `curl` or `wget` installation. If neither `curl` nor
+`wget` are installed then install them with the distribution's package manager.
+
+#### `-s`, `--shell`
+
+After installing chezmoi, initializing your dotfiles, execute your shell. This
+is the default.
+
+### `run` *image-id* *init-args*...
+
+Create a new Docker container using *image-id*, and in it, install chezmoi, run
+`chezmoi init --apply *init-args*`, and execute your shell.
+
+#### `-p`, `--package`
+
+Install chezmoi using the distribution's package manager, if possible.
+Otherwise, fall back to `curl` or `wget` installation. If neither `curl` nor
+`wget` are installed then install them with the distribution's package manager.
+
+## Examples
+
+```sh
+chezmoi docker exec $CONTAINER_ID $GITHUB_USERNAME
+chezmoi docker run alpine:latest $GITHUB_USERNAME
+```

assets/chezmoi.io/docs/reference/commands/podman.md

@@ -33,7 +33,7 @@ is the default.
 
 ### `run` *image-id* *init-args*...
 
-Create a new podman container using *image-id*, and in it, install chezmoit, run
+Create a new podman container using *image-id*, and in it, install chezmoi, run
 `chezmoi init --apply *init-args*`, and execute your shell.
 
 #### `-p`, `--package`

assets/chezmoi.io/mkdocs.yml

@@ -157,6 +157,7 @@ nav:
     - decrypt: reference/commands/decrypt.md
     - destroy: reference/commands/destroy.md
     - diff: reference/commands/diff.md
+    - docker: reference/commands/docker.md
     - doctor: reference/commands/doctor.md
     - dump: reference/commands/dump.md
     - dump-config: reference/commands/dump-config.md

internal/cmd/config.go

@@ -198,6 +198,7 @@ type Config struct {
 	chattr          chattrCmdConfig
 	data            dataCmdConfig
 	destroy         destroyCmdConfig
+	docker          dockerPodmanCmdConfig
 	doctor          doctorCmdConfig
 	dump            dumpCmdConfig
 	dumpConfig      dumpConfigCmdConfig
@@ -208,7 +209,7 @@ type Config struct {
 	init            initCmdConfig
 	managed         managedCmdConfig
 	mergeAll        mergeAllCmdConfig
-	podman          podmanCmdConfig
+	podman          dockerPodmanCmdConfig
 	ssh             sshCmdConfig
 	purge           purgeCmdConfig
 	reAdd           reAddCmdConfig
@@ -362,6 +363,12 @@ func newConfig(options ...configOption) (*Config, error) {
 		data: dataCmdConfig{
 			format: newChoiceFlag("", writeDataFormatValues),
 		},
+		docker: dockerPodmanCmdConfig{
+			exec: dockerPodmanExecCmdConfig{
+				interactive: true,
+				shell:       true,
+			},
+		},
 		dump: dumpCmdConfig{
 			filter:    chezmoi.NewEntryTypeFilter(chezmoi.EntryTypesAll, chezmoi.EntryTypesNone),
 			format:    newChoiceFlag("", writeDataFormatValues),
@@ -401,8 +408,8 @@ func newConfig(options ...configOption) (*Config, error) {
 			filter:    chezmoi.NewEntryTypeFilter(chezmoi.EntryTypesAll, chezmoi.EntryTypesNone),
 			recursive: true,
 		},
-		podman: podmanCmdConfig{
-			exec: podmanExecCmdConfig{
+		podman: dockerPodmanCmdConfig{
+			exec: dockerPodmanExecCmdConfig{
 				interactive: true,
 				shell:       true,
 			},
@@ -1864,6 +1871,8 @@ func (c *Config) newRootCmd() (*cobra.Command, error) {
 		c.newDecryptCommand(),
 		c.newDestroyCmd(),
 		c.newDiffCmd(),
+		c.newDockerPodmanCmd("docker", &c.docker),
+		c.newDockerPodmanCmd("podman", &c.podman),
 		c.newDoctorCmd(),
 		c.newDumpCmd(),
 		c.newDumpConfigCmd(),
@@ -1884,7 +1893,6 @@ func (c *Config) newRootCmd() (*cobra.Command, error) {
 		c.newManagedCmd(),
 		c.newMergeCmd(),
 		c.newMergeAllCmd(),
-		c.newPodmanCmd(),
 		c.newPurgeCmd(),
 		c.newReAddCmd(),
 		c.newRemoveCmd(),

internal/cmd/dockerpodmancmd.go

@@ -0,0 +1,89 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/twpayne/chezmoi/internal/chezmoi"
+)
+
+type dockerPodmanCmdConfig struct {
+	exec dockerPodmanExecCmdConfig
+	run  dockerPodmanRunCmdConfig
+}
+
+type dockerPodmanExecCmdConfig struct {
+	interactive bool
+	_package    bool
+	shell       bool
+}
+
+type dockerPodmanRunCmdConfig struct {
+	_package bool
+}
+
+func (c *Config) newDockerPodmanCmd(command string, config *dockerPodmanCmdConfig) *cobra.Command {
+	commandCmd := &cobra.Command{
+		Use:   command,
+		Short: "Install chezmoi and your dotfiles in a " + command + " container",
+		Annotations: newAnnotations(
+			persistentStateModeNone,
+		),
+	}
+
+	commandExecCmd := &cobra.Command{
+		Use:   "exec container-id [args...]",
+		Short: "Install chezmoi and your dotfiles in an existing " + command + " container",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: c.makeRunEWithSourceState(func(cmd *cobra.Command, args []string, sourceState *chezmoi.SourceState) error {
+			commandArgs := []string{"exec"}
+			if config.exec.interactive {
+				commandArgs = append(commandArgs,
+					"--interactive",
+					"--tty",
+				)
+			}
+			commandArgs = append(commandArgs, args[0])
+			return c.runInstallInitShellSh(sourceState,
+				command, commandArgs,
+				runInstallInitShellOptions{
+					args:        args[1:],
+					interactive: config.exec.interactive,
+					_package:    config.exec._package,
+					shell:       config.exec.shell,
+				},
+			)
+		}),
+		Annotations: newAnnotations(
+			persistentStateModeReadWrite,
+		),
+	}
+	commandExecCmd.Flags().
+		BoolVarP(&config.exec.interactive, "interactive", "i", config.exec.interactive, "Run interactively")
+	commandExecCmd.Flags().BoolVarP(&config.exec._package, "package", "p", config.exec._package, "Install with package")
+	commandExecCmd.Flags().BoolVarP(&config.exec.shell, "shell", "s", config.exec.shell, "Execute shell afterwards")
+	commandCmd.AddCommand(commandExecCmd)
+
+	commandRunCmd := &cobra.Command{
+		Use:   "run image-id [args...]",
+		Short: "Install chezmoi and your dotfiles in a new " + command + " container",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: c.makeRunEWithSourceState(func(cmd *cobra.Command, args []string, sourceState *chezmoi.SourceState) error {
+			return c.runInstallInitShellSh(sourceState,
+				command, []string{"run", "--interactive", "--tty", args[0]},
+				runInstallInitShellOptions{
+					args:        args[1:],
+					interactive: true,
+					_package:    config.run._package,
+					shell:       true,
+				},
+			)
+		}),
+		Annotations: newAnnotations(
+			persistentStateModeReadWrite,
+		),
+	}
+	commandRunCmd.Flags().BoolVarP(&config.run._package, "package", "p", config.run._package, "Install with package")
+	commandCmd.AddCommand(commandRunCmd)
+
+	return commandCmd
+}