V4.5.3 to v4.5.4 upgrade help (Docker)

[G0nz0uk]

Hello, I'm just trying to upgrade Netbox from v4.5.3 to v4.5.4, I've done many upgrades, what would I do in this instance?

git checkout release && git pull -p origin release
M	configuration/extra.py
M	configuration/ldap/extra.py
M	env/netbox.env
Already on 'release'
Your branch is behind 'origin/release' by 14 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
From https://github.com/netbox-community/netbox-docker
 * branch            release    -> FETCH_HEAD

Updating c60defe..909a9d0


error: Your local changes to the following files would be overwritten by merge:
	env/netbox.env
Please commit your changes or stash them before you merge.
Aborting

I thought the env/netbox.env was editable as I added my SNMP server info in there.

[email protected]
EMAIL_PASSWORD=
EMAIL_PORT=25
EMAIL_SERVER=smtpinternal.mydomain.com

I see in the configuration.py there is a email section there, should I be setting our SNMP server address in the extra.py instead? If so what is the format if our server is smtp.internal.domain.com?

'SERVER': environ.get('EMAIL_SERVER', 'localhost'),

# Email settings
EMAIL = {
    'SERVER': environ.get('EMAIL_SERVER', 'localhost'),
    'PORT': _environ_get_and_map('EMAIL_PORT', 25, _AS_INT),
    'USERNAME': environ.get('EMAIL_USERNAME', ''),
    'PASSWORD': _read_secret('email_password', environ.get('EMAIL_PASSWORD', '')),
    'USE_SSL': _environ_get_and_map('EMAIL_USE_SSL', 'False', _AS_BOOL),
    'USE_TLS': _environ_get_and_map('EMAIL_USE_TLS', 'False', _AS_BOOL),
    'SSL_CERTFILE': environ.get('EMAIL_SSL_CERTFILE', ''),
    'SSL_KEYFILE': environ.get('EMAIL_SSL_KEYFILE', ''),
    'TIMEOUT': _environ_get_and_map('EMAIL_TIMEOUT', 10, _AS_INT),  # seconds
    'FROM_EMAIL': environ.get('EMAIL_FROM', ''),
}

[G0nz0uk]

In the end I just did:

docker compose down

git fetch origin && git checkout origin/release -- env/netbox.env
git checkout release && git pull -p origin release

docker compose pull

Edited /env/netbox.env

and replaced these again

[email protected]
EMAIL_SERVER=smtpinternal.domain.com

docker compose up -d