volker.raschek/dcmerge
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix(dockerCompose): add ServiceUlimitsNoFile.MergeFirstWin()

Browse Source
This commit is contained in:
Markus Pesch 2023-08-27 18:55:55 +02:00
parent 14c645dd96
commit a656dc2db1
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/domain/dockerCompose/config.go
View File

@ -1067,6 +1067,27 @@ func (nf *ServiceULimitsNoFile) Equal(equalable Equalable) bool {
}
}
func (nf *ServiceULimitsNoFile) MergeFirstWin(serviceULimitsNoFile *ServiceULimitsNoFile) {
switch {
case nf == nil && serviceULimitsNoFile == nil:
fallthrough
case nf != nil && serviceULimitsNoFile == nil:
return
// WARN: It's not possible to change the memory pointer nf *ServiceULimitsNoFile
// to a new initialized ServiceULimitsNoFile without returning the serviceULimitsNoFile
// it self.
//
// case nf == nil && serviceULimitsNoFile != nil:
// nf = NewServiceULimitsNoFile()
// fallthrough
default:
nf.mergeFirstWinHard(serviceULimitsNoFile.Hard)
nf.mergeFirstWinSoft(serviceULimitsNoFile.Soft)
}
}
// MergeLastWin merges adds or overwrite the attributes of the passed
// ServiceULimits with the existing one.
func (nf *ServiceULimitsNoFile) MergeLastWin(serviceULimitsNoFile *ServiceULimitsNoFile) {
@ -1090,6 +1111,20 @@ func (nf *ServiceULimitsNoFile) MergeLastWin(serviceULimitsNoFile *ServiceULimit
}
}
func (nf *ServiceULimitsNoFile) mergeFirstWinHard(hard uint) {
if nf.Hard != hard {
return
}
nf.Hard = hard
}
func (nf *ServiceULimitsNoFile) mergeFirstWinSoft(soft uint) {
if nf.Soft != soft {
return
}
nf.Soft = soft
}
func (nf *ServiceULimitsNoFile) mergeLastWinHard(hard uint) {
if nf.Hard != hard {
nf.Hard = hard