Merge pull request #120 from jkaninda/fix-dockerfile

fix: Dockerfile backup, restore, and migrate scripts since the migration of base image from Ubuntu to alpine

Dockerfile

@@ -53,7 +53,7 @@ ENV VERSION=${appVersion}
 LABEL author="Jonas Kaninda"
 LABEL version=${appVersion}
 
-RUN apk --update add --no-cache mysql-client mariadb-connector-c tzdata
+RUN apk --update add --no-cache mysql-client mariadb-connector-c tzdata ca-certificates
 RUN mkdir $WORKDIR
 RUN mkdir $BACKUPDIR
 RUN mkdir $TEMPLATES_DIR
@@ -70,13 +70,13 @@ RUN chmod +x /usr/local/bin/mysql-bkup
 RUN ln -s /usr/local/bin/mysql-bkup /usr/local/bin/bkup
 
 # Create backup script and make it executable
-RUN echo '#!/bin/sh\n/usr/local/bin/mysql-bkup backup "$@"' > /usr/local/bin/backup && \
+RUN printf '#!/bin/sh\n/usr/local/bin/mysql-bkup backup "$@"' > /usr/local/bin/backup && \
     chmod +x /usr/local/bin/backup
 # Create restore script and make it executable
-RUN echo '#!/bin/sh\n/usr/local/bin/mysql-bkup restore "$@"' > /usr/local/bin/restore && \
+RUN printf '#!/bin/sh\n/usr/local/bin/mysql-bkup restore "$@"' > /usr/local/bin/restore && \
     chmod +x /usr/local/bin/restore
 # Create migrate script and make it executable
-RUN echo '#!/bin/sh\n/usr/local/bin/mysql-bkup migrate "$@"' > /usr/local/bin/migrate && \
+RUN printf '#!/bin/sh\n/usr/local/bin/mysql-bkup migrate "$@"' > /usr/local/bin/migrate && \
     chmod +x /usr/local/bin/migrate
 
 WORKDIR $WORKDIR

docs/how-tos/receive-notification.md

@@ -32,7 +32,7 @@ services:
       - MAIL_SKIP_TLS=false
       ## Time format for notification 
       - TIME_FORMAT=2006-01-02 at 15:04:05
-      ## Backup reference, in case you want to identifier every backup instance
+      ## Backup reference, in case you want to identify every backup instance
       - BACKUP_REFERENCE=database/Paris cluster
     networks:
       - web
@@ -60,7 +60,7 @@ services:
       - TG_CHAT_ID=
       ## Time format for notification 
       - TIME_FORMAT=2006-01-02 at 15:04:05
-      ## Backup reference, in case you want to identifier every backup instance
+      ## Backup reference, in case you want to identify every backup instance
       - BACKUP_REFERENCE=database/Paris cluster
     networks:
       - web

pkg/backup.go

@@ -255,6 +255,9 @@ func localBackup(db *dbConfig, config *BackupConfig) {
 func s3Backup(db *dbConfig, config *BackupConfig) {
 	bucket := utils.GetEnvVariable("AWS_S3_BUCKET_NAME", "BUCKET_NAME")
 	s3Path := utils.GetEnvVariable("AWS_S3_PATH", "S3_PATH")
+	if config.remotePath != "" {
+		s3Path = config.remotePath
+	}
 	utils.Info("Backup database to s3 storage")
 	startTime = time.Now().Format(utils.TimeFormat())
 
@@ -299,7 +302,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
 		BackupSize:     backupSize,
 		Database:       db.dbName,
 		Storage:        config.storage,
-		BackupLocation: filepath.Join(config.remotePath, finalFileName),
+		BackupLocation: filepath.Join(s3Path, finalFileName),
 		StartTime:      startTime,
 		EndTime:        time.Now().Format(utils.TimeFormat()),
 	})