Merge branch 'release/0.6.1'

elfacht · Jul 15, 2019 · 210d757 · 210d757
2 parents db7a4e2 + 94b6ee4
commit 210d757
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/.env.example b/.env.example
@@ -9,3 +9,6 @@ DEPLOY_ASSETS_DIR="uploads"
 
 # Restart PHP if symlinks are cached – optional
 DEPLOY_RESTART_PHP=""
+
+# Backups to keep
+DEPLOY_KEEP_BACKUPS=5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Things change, people change, everything changes.
 
+## [0.6.1](https://github.com/elfacht/craft-deploy/compare/0.6.0...0.6.1) - 2019-07-15
+### Added
+- Added `DEPLOY_KEEP_BACKUPS` option and function.
+
 ## [0.6.0](https://github.com/elfacht/craft-deploy/compare/0.5.0...0.6.0) - 2019-07-08
 ### Added
 - Added `.env` environment to separate config from code.

diff --git a/README.md b/README.md
@@ -45,6 +45,7 @@ Creates the necessary `releases`, `shared` and `shared/web` folders on the serve
 - Runs `./craft migrate/all` and `./craft project-config/sync`.
 - Creates a symlink from the `current` folder to the newest release.
 - Deletes old releases and keeps max. 5 releases.
+- Deletes oldest backup and keeps max. `[DEPLOY_KEEP_BACKUPS]` backups.
 - Restarts PHP to delete symlink cache (optional)
 
 ### gitlab-webhook-push.php

diff --git a/deploy.sh b/deploy.sh
@@ -35,6 +35,7 @@ GIT_REPO=$(read_var DEPLOY_REPO .env)
 ROOT_PATH=$(read_var DEPLOY_ROOT .env)
 ASSETS_DIR=$(read_var DEPLOY_ASSETS_DIR .env)
 RESTART_PHP=$(read_var DEPLOY_RESTART_PHP .env)
+KEEP_BACKUPS=$(read_var DEPLOY_KEEP_BACKUPS .env)
 
 #######################################
 # Exit if any command fails
@@ -158,6 +159,29 @@ if composer install --no-interaction --prefer-dist --optimize-autoloader; then
     printf -- ' DONE!\n';
   fi
 
+  #######################################
+  # Kepp max. X backups,
+  # delete oldest backup
+  #######################################
+  COUNT=`/bin/ls -l $ROOT_PATH/shared/storage/backups | /usr/bin/wc -l`
+  MINBACKUPS=$KEEP_BACKUPS+1 # Keep X releases
+
+  if [[ $COUNT -gt $MINBACKUPS ]]; then
+    OLDEST_BACKUP=$(ls -tr $ROOT_PATH/shared/storage/backups/* | head -1)
+    printf -- "- Delete oldest backup '$OLDEST_BACKUP' .."
+
+    DONE=0;
+    while [ $DONE -eq 0 ]; do
+      rm -rf $OLDEST_BACKUP
+
+      if [ "$?" = "0" ]; then DONE=1; fi;
+      printf -- '.';
+      sleep 1;
+    done
+
+    printf -- ' DONE!\n';
+  fi
+
   #######################################
   # Restart PHP
   #######################################