jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ignore portBindings and exportPorts for subcontainers

Browse Source
This commit is contained in:
Girish Ramakrishnan
2015-10-20 10:30:40 -07:00
parent c80a5b59ab
commit 76d286703c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/docker.js
View File

@@ -135,7 +135,6 @@ function createSubcontainer(app, cmd, callback) {
// docker portBindings requires ports to be exposed // docker portBindings requires ports to be exposed
exposedPorts[manifest.httpPort + '/tcp'] = {}; exposedPorts[manifest.httpPort + '/tcp'] = {};
// On Mac (boot2docker), we have to export the port to external world for port forwarding from Mac to work
dockerPortBindings[manifest.httpPort + '/tcp'] = [ { HostIp: '127.0.0.1', HostPort: app.httpPort + '' } ]; dockerPortBindings[manifest.httpPort + '/tcp'] = [ { HostIp: '127.0.0.1', HostPort: app.httpPort + '' } ];
var portEnv = []; var portEnv = [];
@@ -160,7 +159,7 @@ function createSubcontainer(app, cmd, callback) {
Image: app.manifest.dockerImage, Image: app.manifest.dockerImage,
Cmd: cmd, Cmd: cmd,
Env: stdEnv.concat(addonEnv).concat(portEnv), Env: stdEnv.concat(addonEnv).concat(portEnv),
ExposedPorts: exposedPorts, ExposedPorts: isSubcontainer ? { } : exposedPorts,
Volumes: { // see also ReadonlyRootfs Volumes: { // see also ReadonlyRootfs
'/tmp': {}, '/tmp': {},
'/run': {} '/run': {}
@@ -174,7 +173,7 @@ function createSubcontainer(app, cmd, callback) {
Binds: addons.getBindsSync(app, app.manifest.addons), Binds: addons.getBindsSync(app, app.manifest.addons),
Memory: memoryLimit / 2, Memory: memoryLimit / 2,
MemorySwap: memoryLimit, // Memory + Swap MemorySwap: memoryLimit, // Memory + Swap
PortBindings: dockerPortBindings, PortBindings: isSubcontainer ? { } : dockerPortBindings,
PublishAllPorts: false, PublishAllPorts: false,
ReadonlyRootfs: semver.gte(targetBoxVersion(app.manifest), '0.0.66'), // see also Volumes in startContainer ReadonlyRootfs: semver.gte(targetBoxVersion(app.manifest), '0.0.66'), // see also Volumes in startContainer
Links: addons.getLinksSync(app, app.manifest.addons), Links: addons.getLinksSync(app, app.manifest.addons),