Merge pull request #1 from Huskydog9988/additional-args

Author: Huskydog9988

backup.go

@@ -163,31 +163,46 @@ func (b Backup) backupContainer(ctx context.Context, options *BackupContainerOpt
 func getBackupCommand(jobConfig *JobConfig) ([]string, string) {
 	if jobConfig.Config["dbType"] == "postgres" {
 
-		cmd := []string{"pg_dump", "-c", "-w"}
+		cmd := []string{"pg_dump"}
 
 		// default to postgres user
 		pgUser := "postgres"
+
+		// if we have a custom user, use it
 		if jobConfig.Config["dbUser"] != "" {
 
 			log.Debugf("Using custom postgres user: %s", jobConfig.Config["dbUser"])
 			pgUser = jobConfig.Config["dbUser"]
 		} else {
 			log.Debugf("Using default postgres user: %s", jobConfig.Config["dbUser"])
 		}
+		// add the user to the command
 		cmd = append(cmd, "-U", pgUser)
 
-		// if we have a password, we need to pass it to the command
+		// if we have a password, we need add the password flag
 		if jobConfig.Config["dbPassword"] != "" {
 			cmd = append(cmd, "--password")
 		}
 
+		// add additional args to the command
+		if jobConfig.Config["dbAdditionalArgs"] != "" {
+			cmd = append(cmd, jobConfig.Config["dbAdditionalArgs"])
+		}
+
 		// https://www.postgresql.org/docs/current/app-pg-dumpall.html
 		return cmd, jobConfig.Config["dbPassword"]
 	}
 
+	// if jobConfig.Config["dbType"] == "mariadb" {
+	// 	cmd := []string{"mariadb-dump"}
+
+	// 	return cmd, jobConfig.Config["dbPassword"]
+	// }
+
 	return []string{"echo", "Unknown db type"}, ""
 }
 
+// generate the backup file name
 func getBackupFileName(jobConfig *JobConfig, containerName string) string {
 	// currentTime := time.Now()
 

config.yaml

@@ -20,6 +20,8 @@ jobs:
     # optional: allows you to specify a custom db password for cmd to use
     # postgres shouldn't need this, but mysql and mariadb will
     dbPassword: "postgres"
+    # optional: allows you to specify additional arguments to pass to the dump cmd
+    dbAdditionalArgs: "--clean"
 
   # optional: you can specify multiple jobs
   textExact:

test/compose.yaml

@@ -19,8 +19,3 @@ services:
     volumes:
       # - ./postgres1:/var/lib/postgresql/data
       - ./out/postgres2:/out
-
-  adminer:
-    image: adminer
-    ports:
-      - 8080:8080