Remove .DS_Store files before restoring snapshot, fixes #2765 (#2810)

ddev · Feb 15, 2021 · 8ac90f3 · 8ac90f3
1 parent d62f87c
commit 8ac90f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/containers/ddev-dbserver/files/docker-entrypoint.sh b/containers/ddev-dbserver/files/docker-entrypoint.sh
@@ -29,6 +29,8 @@ if [ $# = "2" -a "${1:-}" = "restore_snapshot" ] ; then
   snapshot_dir="/mnt/ddev_config/db_snapshots/${2:-nothingthere}"
   if [ -d "$snapshot_dir" ] ; then
     echo "Restoring from snapshot directory $snapshot_dir"
+    # Ugly macOS .DS_Store in this directory can break the restore
+    find ${snapshot_dir} -name .DS_Store -print0 | xargs rm -f
     sudo rm -rf /var/lib/mysql/*
   else
     echo "$snapshot_dir does not exist, not attempting restore of snapshot"

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -46,7 +46,7 @@ var WebTag = "20210210_acquia" // Note that this can be overridden by make
 var DBImg = "drud/ddev-dbserver"
 
 // BaseDBTag is the main tag, DBTag is constructed from it
-var BaseDBTag = "20210214_db_build_refactor"
+var BaseDBTag = "20210215_ds_store"
 
 // DBAImg defines the default phpmyadmin image tag used for applications.
 var DBAImg = "phpmyadmin"