Proper upgrade lifecycle with custom docker image

[netgab]

Hi community,

I'm aware, that there is a guide in the Wiki to build a custom docker image, if plugins must be used.

The focus of this guide - from my point of view is the customizing of the docker image.

How do you keep your customized state up to date? Can you just refer to the normal upgrade guide?
I guess, if you do the git pull -p origin release, there could be merge conflicts with the customized configuration/plugins.py file, which is part of the official repo (which has a different content). Or is git merging clever enough?

So from the Netbox docker Plugins guide, the newly introduced (or modified files), should not be a problem, right?

• Dockerfile-Plugins: New file / no problem (no merge conflict on pull)
• docker-compose.override.yml: New file / no problem (no merge conflict on pull).
• configuration/plugins.py: ⚠ Potential issue - already exists in original repo with different content (right?)

I have not tried it yet - this just came across my mind, when reading the guide. Any good hints or insights on this? How do you handle your customized, plugin-enabled netbox-docker environments day by day?