ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-23 01:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #898 from balena-io/897-normalise-compose-ports

Browse Source 
fix: Normalize ports from compose file on instantiation
This commit is contained in:
CameronDiver
2019-02-11 10:03:25 +00:00
committed by GitHub
parent 04a9790e11 f3264862ca
commit 7c81061898
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compose/ports.ts
View File

@ -140,10 +140,7 @@ export class PortMap {
} }
public static fromComposePorts(ports: string[]): PortMap[] { public static fromComposePorts(ports: string[]): PortMap[] {
return _(ports) return PortMap.normalisePortMaps(ports.map(p => new PortMap(p)));
.map(p => new PortMap(p))
.sortBy(p => p.ports.internalStart)
.value();
} }
private parsePortString(portStr: string): void { private parsePortString(portStr: string): void {

9
test/16-ports.spec.coffee
View File

@ -252,6 +252,15 @@ describe 'Ports', ->
expect(portMapsTarget).to.deep.equal(portMapsCurrent) expect(portMapsTarget).to.deep.equal(portMapsCurrent)
describe 'fromComposePorts', ->
it 'should normalise compose ports', ->
expect(PortMap.fromComposePorts([
'80:80',
'81:81',
'82:82',
])).to.deep.equal([
new PortMap('80-82')
])
describe 'normalisePortMaps', -> describe 'normalisePortMaps', ->