SOLVED 2318 commits behind...
I recently installed MM with docker using this image:
It ran fine for a couple of days then yesterday I received this meesage:
MagicMirror2 update available.
The current installation is 2318 commits behind on the master branch.
My current version is:
grep version package.json "version": "2.5.0"
I have done a lot of searching. I have read that there is a cron job that updates the image for docker, but I have rebuilt several times and still no luck and I don’t see any changes on the docker git.
I have tried git pull and get error after error.
error: Your local changes to the following files would be overwritten by merge: package-lock.json vendor/package-lock.json Please commit your changes or stash them before you merge. error: The following untracked working tree files would be overwritten by merge: modules/default/clock/clock_screenshot.png modules/default/compliments/compliments_screenshot.png modules/default/currentweather/weather_screenshot.png modules/default/newsfeed/newsfeed_screenshot.png modules/default/weather/README.md modules/default/weather/current.njk modules/default/weather/current.png modules/default/weather/forecast.njk modules/default/weather/forecast.png modules/default/weather/providers/README.md modules/default/weather/providers/darksky.js modules/default/weather/providers/openweathermap.js modules/default/weather/weather.css modules/default/weather/weather.js modules/default/weather/weatherobject.js modules/default/weather/weatherprovider.js modules/default/weatherforecast/forecast_screenshot.png Please move or remove them before you merge. Aborting
@savona rename those folders then got pull, then you can delete once MM is working on the new version
@dazza120 But then if I rebuild the docker container wouldn’t it just put me back 2318 commits?
UPDATE: Yes, I rebuilt the docker container and it reverted right back.
@bastilimbach Any help?
@savona - Would it make sense to build from image, rename the git files, pull, update and then upload the fixed image as a PR?
but I saw that the originator of the docker image said it was updated daily with a cronjob on this post:
package-lock.jsoncan just be deleted. Did you intentionally change the files in the
@idoodler No I did not change the default directory at all. That is why this is so odd to me.
I got a message saying my MM was out of date, so I pulled the new docker image and now have the 2318 message also.
The top of my CHANGELOG.md reads “## [2.5.0] - 2018-10-01”
Though the “image date” as reported by Portainer is “Created 2019-01-01 15:08:22”
Do we need to wait for bastilimbach?
@savona OK, you may have a corrupt git directory then. You may try to clone it again.