Merge branch 'feature-net-image-params'

ICTU · May 16, 2017 · a4f312f · a4f312f
1 parent ce04186
commit a4f312f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/index.coffee b/index.coffee
@@ -9,7 +9,7 @@ ENABLE_NETWORK_HEALTHCHECK = env.get 'ENABLE_NETWORK_HEALTHCHECK', false
 NETWORK_HEALTHCHECK_TEST_INTERFACE = env.get 'NETWORK_HEALTHCHECK_TEST_INTERFACE', 'eth0'
 NETWORK_HEALTHCHECK_TEST_IP_PREFIX = env.get 'NETWORK_HEALTHCHECK_TEST_IP_PREFIX', '10.25'
 
-pipeworksCmd = env.get 'PIPEWORKS_CMD', 'eth1 -i eth0 @CONTAINER_NAME@ dhclient @3055'
+pipeworksCmd = env.get 'PIPEWORKS_CMD', 'eth1 -i eth0 @CONTAINER_NAME@ 0/0 @3055'
 vlan = parseInt(pipeworksCmd.slice(-4)) - 3000
 scanCmd = env.get 'NETWORK_SCAN_CMD', "nmap -sP -n 10.25.#{vlan}.51-240"
 
@@ -35,7 +35,7 @@ config =
     scanInterval: parseInt(env.get 'DHCP_SCAN_INTERVAL', '5000')
     scanEnabled: env.get 'DHCP_SCAN_ENABLED', 'true'
   net_container:
-    image: env.get 'NETWORK_IMAGE', 'ictu/pipes:1'
+    image: env.get 'NETWORK_IMAGE', 'ictu/pipes:2'
     pipeworksCmd: pipeworksCmd
     startcheck:
       test: "ifconfig #{NETWORK_HEALTHCHECK_TEST_INTERFACE} | grep inet | grep #{NETWORK_HEALTHCHECK_TEST_IP_PREFIX}"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docker-dashboard-agent-compose",
-  "version": "2.11.0",
+  "version": "3.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/tests/coffee/compose.test.coffee b/tests/coffee/compose.test.coffee
@@ -3,8 +3,8 @@ compose = require '../../src/coffee/compose.coffee'
 
 standardCfg =
   net_container:
-    image: 'ictu/pipes:1'
-    pipeworksCmd: 'eth12 -i eth0 @CONTAINER_NAME@ dhclient @1234'
+    image: 'ictu/pipes:2'
+    pipeworksCmd: 'eth12 -i eth0 @CONTAINER_NAME@ 0/0 @1234'
 
 describe 'Compose', ->
   describe 'augmentCompose', ->
@@ -171,8 +171,8 @@ describe 'Compose', ->
       assert.equal service.network_mode, 'service:bb-net-service1'
       assert.deepEqual service.depends_on, 'bb-net-service1': condition: 'service_started'
       assert.deepEqual doc.services['bb-net-service1'],
-        image: 'ictu/pipes:1'
-        environment: eth0_pipework_cmd: "eth12 -i eth0 @CONTAINER_NAME@ dhclient @1234"
+        image: 'ictu/pipes:2'
+        environment: eth0_pipework_cmd: "eth12 -i eth0 @CONTAINER_NAME@ 0/0 @1234"
         hostname: 'service1.instance2.google.com'
         dns_search: 'instance2.google.com'
         network_mode: 'none'