Fixed merge conflict

2026-10-18 17:54:15 +02:00 · 2018-04-06 12:09:31 -07:00
parent 0342d64bd2 ce2b515d49
commit c10c293f6b
8 changed files with 175 additions and 0 deletions
@@ -155,6 +155,7 @@ func execute() error {
 			if err != nil {
 				return err
 			}
+			util.MoveVolumeWhitelistToWhitelist()
 			if contents == nil {
 				logrus.Info("No files were changed, appending empty layer to config.")
 				sourceImage.AppendConfigHistory(constants.Author, true)