diff --git a/test/test.ts b/test/test.ts index a85d279..30ec99d 100644 --- a/test/test.ts +++ b/test/test.ts @@ -87,24 +87,22 @@ tap.test('should create a service', async () => { Name: 'testNetwork' }); const testSecret = await docker.DockerSecret.createSecret(testDockerHost, { - name: 'serviceSecret', + name: 'testSecret', version: '0.0.1', labels: {}, contentArg: '{"hi": "wow"}' }); const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, { - imageUrl: 'nginx:latest' + imageUrl: 'registry.gitlab.com/hosttoday/ht-docker-static' }); const testService = await docker.DockerService.createService(testDockerHost, { image: testImage, - labels: { - testlabel: 'hi' - }, + labels: {}, name: 'testService', networks: [testNetwork], networkAlias: 'testService', secrets: [testSecret], - ports: [] + ports: ['3000:80'] }); await testService.remove(); diff --git a/ts/docker.classes.image.ts b/ts/docker.classes.image.ts index 98cefe8..71c0e22 100644 --- a/ts/docker.classes.image.ts +++ b/ts/docker.classes.image.ts @@ -137,6 +137,10 @@ export class DockerImage { // get stuff public async getVersion() { - return this.Labels.version; + if (this.Labels && this.Labels.version) { + return this.Labels.version; + } else { + return 'x.x.x'; + } } } diff --git a/ts/docker.classes.service.ts b/ts/docker.classes.service.ts index f526535..894198d 100644 --- a/ts/docker.classes.service.ts +++ b/ts/docker.classes.service.ts @@ -92,8 +92,8 @@ export class DockerService { const containerPort = portArray[1]; ports.push({ Protocol: 'tcp', - PublishedPort: parseInt(containerPort, 10), - TargetPort: parseInt(hostPort, 10) + PublishedPort: parseInt(hostPort, 10), + TargetPort: parseInt(containerPort, 10) }); }