Docker images refactored

rezachalak · Oct 28, 2023 · 212a38c · 212a38c
1 parent 272094b
commit 212a38c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/backup-zen-docker-images-latest.yml b/.github/workflows/backup-zen-docker-images-latest.yml
@@ -31,20 +31,20 @@ jobs:
           context: ./docker/pg
           file: ./docker/pg/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pg:latest
+          tags: rezachalak/bzen-pg:latest
       -
         name: Build and push MongoDB-Backup-Zen
         uses: docker/build-push-action@v4
         with:
           context: ./docker/mongo
           file: ./docker/mongo/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/mongo:latest
+          tags: rezachalak/bzen-mongo:latest
       -
         name: Build and push MySQL-Backup-Zen
         uses: docker/build-push-action@v4
         with:
           context: ./docker/mysql
           file: ./docker/mysql/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/mysql:latest
+          tags: rezachalak/bzen-mysql:latest
diff --git a/.github/workflows/docker-images-with-tags.yml b/.github/workflows/docker-images-with-tags.yml
@@ -28,20 +28,20 @@ jobs:
           context: ./docker/pg
           file: ./docker/pg/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/pg:${{  github.ref_name }}
+          tags: rezachalak/bzen-pg:${{  github.ref_name }}
       -
         name: Build and push MongoDB-Backup-Zen
         uses: docker/build-push-action@v4
         with:
           context: ./docker/mongo
           file: ./docker/mongo/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/mongo:${{  github.ref_name }}
+          tags: rezachalak/bzen-mongo:${{  github.ref_name }}
       -
         name: Build and push MySQL-Backup-Zen
         uses: docker/build-push-action@v4
         with:
           context: ./docker/mysql
           file: ./docker/mysql/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/mysql:${{  github.ref_name }}
+          tags: rezachalak/bzen-mysql:${{  github.ref_name }}
diff --git a/charts/backup-zen/templates/_helpers.tpl b/charts/backup-zen/templates/_helpers.tpl
@@ -93,11 +93,11 @@ Create Dumper image address
     {{- if .Values.cronjob.image -}}
         {{- .Values.cronjob.image -}}
     {{- else if eq .Values.databaseType "PostgreSQL" -}}
-        backupzen/pg:{{ .Chart.AppVersion }}
+        rezachalak/bzen-pg:{{ .Chart.AppVersion }}
     {{- else if eq .Values.databaseType "MySQL" -}}
-        backupzen/mysql:{{ .Chart.AppVersion }}
+        rezachalak/bzen-mysql:{{ .Chart.AppVersion }}
     {{- else if eq .Values.databaseType "MongoDB" -}}
-        backupzen/mongo:{{ .Chart.AppVersion }}
+        rezachalak/bzen-mongo:{{ .Chart.AppVersion }}
     {{- end -}}
 {{- end -}}
 

diff --git a/charts/backup-zen/values.yaml b/charts/backup-zen/values.yaml
@@ -31,7 +31,7 @@ global:
   failedTeamsURL: https://myorg.webhook.office.com/webhookb2/blob-blob-blob
 
 cronjob:
-  # image: rezachalak/pg-backup-zen:1.0.0
+  # image: rezachalak/bzen-mongo:1.0.0
   pullPolicy: Always
   imagePullSecrets: []
   restartPolicy: Never

diff --git a/docker/build.sh b/docker/build.sh
@@ -7,13 +7,13 @@ fi
 SCRIPTPATH=$(cd ${0%/*} && pwd -P)
 
 cd $SCRIPTPATH/mongo/
-docker build . -t backupzen/mongo:$VERSION
-docker push backupzen/mongo:$VERSION
+docker build . -t rezachalak/bzen-mongo:$VERSION
+docker push rezachalak/bzen-mongo:$VERSION
 
 cd $SCRIPTPATH/mysql/
-docker build . -t backupzen/mysql:$VERSION
-docker push backupzen/mysql:$VERSION
+docker build . -t rezachalak/bzen-mysql:$VERSION
+docker push rezachalak/bzen-mysql:$VERSION
 
 cd $SCRIPTPATH/pg/
-docker build . -t backupzen/pg:$VERSION
-docker push backupzen/pg:$VERSION
+docker build . -t rezachalak/bzen-pg:$VERSION
+docker push rezachalak/bzen-pg:$VERSION