Can't Rebuild Discourse?

docker

#1

I added a new plugin a few minutes ago, and – as usual – I went to run ./launcher rebuild app. However, I was greeted with the following message being repeated over and over and over again:

Ensuring discourse docker is up to date
Fetching origin
Updating Discourse Docker
Updating fb06e72..c89bb01
error: Your local changes to the following files would be overwritten by merge:
        templates/web.ssl.template.yml
Please, commit your changes or stash them before you can merge.
Aborting
failed to update

How can I fix this issue?


#2

just a shot in the dark, but try to rename that file and rebuild again:

 mv /var/discourse/templates/web.ssl.template.yml /var/discourse/templates/web/ssl/template/yml.x

wait, before you do that… are you using the ssl template in your yaml file?


#3

I am, yes. It looks like the file was updated?


#4

Yes, it was recently if I’m recalling correctly. I think the “stash” it’s referring to would be moving this file elsewhere. They are templates that need to be renamed to be put in use.


#5

Does anyone know what was changed? Is it safe to just copy it back?


#6

States last change 2 days ago on github, commit a missing “;”

https://raw.githubusercontent.com/discourse/discourse_docker/master/templates/web.ssl.template.yml

Check that out and compare it to what you got right now.


(Kane York) #7

Maybe run a git diff to figure out what you changed, too?