diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index b7ee2ce48..27995a720 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -53,9 +53,9 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" }, "aws-sdk": { - "version": "2.97.0", + "version": "2.98.0", "from": "aws-sdk@>=2.97.0 <3.0.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.97.0.tgz", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.98.0.tgz", "dependencies": { "uuid": { "version": "3.0.1", @@ -183,7 +183,7 @@ }, "cloudron-manifestformat": { "version": "2.9.0", - "from": "cloudron-manifestformat@>=2.8.0 <3.0.0", + "from": "cloudron-manifestformat@>=2.9.0 <3.0.0", "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-2.9.0.tgz", "dependencies": { "safetydance": { diff --git a/package.json b/package.json index 97eb6a8b7..5a99e722f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "async": "^2.5.0", "aws-sdk": "^2.97.0", "body-parser": "^1.17.2", - "cloudron-manifestformat": "^2.8.0", + "cloudron-manifestformat": "^2.9.0", "connect-ensure-login": "^0.1.1", "connect-lastmile": "^0.1.0", "connect-timeout": "^1.9.0", @@ -74,7 +74,7 @@ "bootstrap-sass": "^3.3.3", "del": "^1.1.1", "expect.js": "*", - "gulp": "^3.8.11", + "gulp": "^3.9.1", "gulp-autoprefixer": "^2.3.0", "gulp-concat": "^2.4.3", "gulp-cssnano": "^2.1.0", diff --git a/src/docker.js b/src/docker.js index 9fda454a4..b15a4f082 100644 --- a/src/docker.js +++ b/src/docker.js @@ -209,6 +209,14 @@ function createSubcontainer(app, name, cmd, options, callback) { SecurityOpt: enableSecurityOpt ? [ "apparmor=docker-cloudron-app" ] : null // profile available only on cloudron } }; + + var capabilities = manifest.capabilities || []; + if (capabilities.includes('net_admin')) { + containerOptions.HostConfig.CapAdd = [ + 'NET_ADMIN' + ]; + } + containerOptions = _.extend(containerOptions, options); debugApp(app, 'Creating container for %s with options %j', app.manifest.dockerImage, containerOptions);