Closed tahoward closed 6 years ago
I'm not ... too familiar with docker, enough to know why this error would come up. The error suggests that the local copy has been changed (and thus it's somehow modified from any version that exists in the official repo).
webui.js isn't something that has been touched in ages, and the commit you're coming from is pretty old: Sep 7, 2016. That said, I think that this is probably a one-time occurrence and can be solved relatively easily.
I'd recommend you attach to your MineOS container and run the normal reset mechanism:
1) cd /usr/games/minecraft && bash reset_webui.sh
or
2) cd /usr/games/minecraft && git fetch && git reset --hard origin/master
My best guess is the combination of these two lines are causing the issue. Not exactly sure why a git fetch is being performed right after the initial clone...
https://github.com/hexparrot/mineos-docker/blob/master/crux/Dockerfile#L47 https://github.com/hexparrot/mineos-docker/blob/master/crux/entrypoint.sh#L45
The docker hub builds from this repository appear deprecated after checking the mineos-node commit hashes; which are about a year behind mineos-node master.
Image: hexparrot/mineos:node-crux
On start-up a git merge conflict occurs attempting to merge
https://github.com/hexparrot/mineos-node
: