Compare commits

..

1 Commits

Author SHA1 Message Date
0df14f37b4 Merge pull request #159 from jkaninda/refactor
chore: add convert bytes to a human-readable string with the appropri…
2024-12-12 13:29:22 +01:00
3 changed files with 4 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
name: Build name: Build
on: on:
push: push:
branches: ['nightly'] branches: ['develop']
env: env:
BUILDKIT_IMAGE: jkaninda/mysql-bkup BUILDKIT_IMAGE: jkaninda/mysql-bkup
jobs: jobs:
@@ -28,7 +28,7 @@ jobs:
file: "./Dockerfile" file: "./Dockerfile"
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64,linux/arm/v7
build-args: | build-args: |
appVersion=nightly appVersion=develop-${{ github.sha }}
tags: | tags: |
"${{vars.BUILDKIT_IMAGE}}:nightly" "${{vars.BUILDKIT_IMAGE}}:develop-${{ github.sha }}"

View File

@@ -129,7 +129,7 @@ func BackupTask(db *dbConfig, config *BackupConfig) {
} }
} }
func startMultiBackup(bkConfig *BackupConfig, configFile string) { func startMultiBackup(bkConfig *BackupConfig, configFile string) {
utils.Info("Starting Multi backup task...") utils.Info("Starting backup task...")
conf, err := readConf(configFile) conf, err := readConf(configFile)
if err != nil { if err != nil {
utils.Fatal("Error reading config file: %s", err) utils.Fatal("Error reading config file: %s", err)

View File

@@ -155,8 +155,6 @@ func readConf(configFile string) (*Config, error) {
// checkConfigFile checks config files and returns one config file // checkConfigFile checks config files and returns one config file
func checkConfigFile(filePath string) (string, error) { func checkConfigFile(filePath string) (string, error) {
// Remove the quotes
filePath = strings.Trim(filePath, `"`)
// Define possible config file names // Define possible config file names
configFiles := []string{filepath.Join(workingDir, "config.yaml"), filepath.Join(workingDir, "config.yml"), filePath} configFiles := []string{filepath.Join(workingDir, "config.yaml"), filepath.Join(workingDir, "config.yml"), filePath}