rabin 7 年之前
父節點
當前提交
db8775882b
共有 3 個文件被更改,包括 6 次插入8 次删除
  1. 4 6
      src/docker.py
  2. 1 1
      src/docker/build/java/hadoop/Dockerfile
  3. 1 1
      src/docker/build/java/spark/Dockerfile

+ 4 - 6
src/docker.py

@@ -67,7 +67,7 @@ class Docker(object):
 				config['image'] = self.core['images'][config['image']]
 			method(config=config, name=name, item=item, index=i, action=action)
 			if action in ('stop', 'restart', 'rm', 'rmb', 'reset', 'run', 'create'):
-				self.slave(config, item, action)
+				self.slave(method, config, item, action)
 			i = i + 1
 
 	@classmethod
@@ -162,17 +162,15 @@ class Docker(object):
 			Core.shell('hook.' + config[key] + ' ' + name + ' ' + Core.path, bg=True)
 
 	@classmethod
-	def slave(self, config, name, action):
+	def slave(self, method, config, name, action):
 		if 'slave' in config:
-			i = 1
 			num = int(config['slave'])
 			key = ['slave', 'command', 'alias', 'port', 'hook.start', 'hook.end']
 			for k in key:
 				if k in config:
 					del config[k]
-			while (i <= num):
-				self.runServerOne(config, name + '-slave', i, action)
-				i = i + 1
+			config['num'] = num
+			self.handle(method, config, name + '-slave', action)
 	@classmethod
 	def tar(self, name):
 		path = Core.path + 'data/backup/' + name + '/'

+ 1 - 1
src/docker/build/java/hadoop/Dockerfile

@@ -5,7 +5,7 @@ MAINTAINER Rabin "https://github.com/shemic"
 # set environment variable
 ENV HADOOP_HOME=/usr/local/hadoop
 ENV HADOOP_CONF_DIR=$HADOOP_HOME/etc/hadoop
-ENV HADOOP_VERSION=2.7.3
+ENV HADOOP_VERSION=2.7.4
 ENV HADOOP_LOG_DIR=/root/hadoop/logs
 ENV YARN_CONF_DIR=$HADOOP_CONF_DIR
 ENV YARN_LOG_DIR=/root/yarn/logs

+ 1 - 1
src/docker/build/java/spark/Dockerfile

@@ -10,7 +10,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HADOOP_HOME/lib/native
 ENV PATH=$PATH:$HADOOP_HOME/bin:$HADOOP_HOME/sbin
 
 ENV SPARK_HOME=/usr/local/spark
-ENV SPARK_VERSION=2.1.1
+ENV SPARK_VERSION=2.1.2
 ENV SPARK_HADOOP=hadoop2.7
 ENV PATH=$PATH:$SPARK_HOME/bin