Fixed merge conflict

2026-10-18 17:06:51 +02:00 · 2018-04-11 15:05:12 -07:00
parent 59a5950e9e 620a95451e
commit cf90bd73d4
10 changed files with 242 additions and 37 deletions
@@ -160,6 +160,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)