MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    2318 commits behind...

    Scheduled Pinned Locked Moved Solved Troubleshooting
    17 Posts 8 Posters 6.0k Views 7 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • S Offline
      savona
      last edited by yawns

      I recently installed MM with docker using this image:

      https://github.com/bastilimbach/docker-MagicMirror

      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
      

      Any help?

      D idoodlerI 2 Replies Last reply Reply Quote 0
      • D Offline
        dazza120 @savona
        last edited by

        @savona rename those folders then got pull, then you can delete once MM is working on the new version

        S 1 Reply Last reply Reply Quote 0
        • S Offline
          savona @dazza120
          last edited by savona

          @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.

          S 1 Reply Last reply Reply Quote 0
          • S Offline
            savona @savona
            last edited by

            @bastilimbach Any help?

            bheplerB 1 Reply Last reply Reply Quote 0
            • bheplerB Offline
              bhepler Module Developer @savona
              last edited by

              @savona - Would it make sense to build from image, rename the git files, pull, update and then upload the fixed image as a PR?

              S 1 Reply Last reply Reply Quote 0
              • S Offline
                savona @bhepler
                last edited by

                @bhepler maybe.

                but I saw that the originator of the docker image said it was updated daily with a cronjob on this post:

                https://forum.magicmirror.builders/topic/5316/automatic-docker-build/2

                1 Reply Last reply Reply Quote 0
                • idoodlerI Offline
                  idoodler Module Developer @savona
                  last edited by

                  @savona Both package-lock.json can just be deleted. Did you intentionally change the files in the default directory?

                  S 1 Reply Last reply Reply Quote 0
                  • S Offline
                    savona @idoodler
                    last edited by

                    @idoodler No I did not change the default directory at all. That is why this is so odd to me.

                    idoodlerI 1 Reply Last reply Reply Quote 0
                    • R Offline
                      rummyr
                      last edited by

                      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?

                      1 Reply Last reply Reply Quote 0
                      • idoodlerI Offline
                        idoodler Module Developer @savona
                        last edited by

                        @savona OK, you may have a corrupt git directory then. You may try to clone it again.

                        1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 1 / 2
                        • First post
                          Last post
                        Enjoying MagicMirror? Please consider a donation!
                        MagicMirror created by Michael Teeuw.
                        Forum managed by Sam, technical setup by Karsten.
                        This forum is using NodeBB as its core | Contributors
                        Contact | Privacy Policy