diff --git a/cmd/root.go b/cmd/root.go index a9ea49b..0433ec1 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -41,6 +41,7 @@ func init() { rootCmd.PersistentFlags().BoolVar(&flags.CI, "ci", false, "CI mode disabled interactive mode and colors and enables verbosity") rootCmd.PersistentFlags().BoolVarP(&flags.VERBOSE, "verbose", "v", false, "verbose mode") rootCmd.PersistentFlags().StringVar(&flags.RESTIC_BIN, "restic-bin", "restic", "specify custom restic binary") + rootCmd.PersistentFlags().StringVar(&flags.DOCKER_IMAGE, "docker-image", "cupcakearmy/autorestic:"+internal.VERSION, "specify a custom docker image") cobra.OnInitialize(initConfig) } diff --git a/internal/backend.go b/internal/backend.go index 40bb9d6..fa3afcc 100644 --- a/internal/backend.go +++ b/internal/backend.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/cupcakearmy/autorestic/internal/colors" + "github.com/cupcakearmy/autorestic/internal/flags" ) type BackendRest struct { @@ -160,7 +161,6 @@ func (b Backend) ExecDocker(l Location, args []string) (int, string, error) { args = append([]string{"restic"}, args...) docker := []string{ "run", "--rm", - "--pull", "always", "--entrypoint", "ash", "--workdir", dir, "--volume", volume + ":" + dir, @@ -194,6 +194,7 @@ func (b Backend) ExecDocker(l Location, args []string) (int, string, error) { for key, value := range env { docker = append(docker, "--env", key+"="+value) } - docker = append(docker, "cupcakearmy/autorestic:"+VERSION, "-c", strings.Join(args, " ")) + + docker = append(docker, flags.DOCKER_IMAGE, "-c", strings.Join(args, " ")) return ExecuteCommand(options, docker...) } diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 8d32124..e03cc25 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -5,4 +5,5 @@ var ( VERBOSE bool = false CRON_LEAN bool = false RESTIC_BIN string + DOCKER_IMAGE string )