remove start-ssh.sh

yuio4235 · Jun 11, 2016 · 3b7b450 · 3b7b450
1 parent 54963c6
commit 3b7b450
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/hadoop-master/Dockerfile b/hadoop-master/Dockerfile
@@ -19,17 +19,15 @@ RUN mv /tmp/hdfs-site.xml $HADOOP_INSTALL/etc/hadoop/hdfs-site.xml && \
     mv /tmp/yarn-site.xml $HADOOP_INSTALL/etc/hadoop/yarn-site.xml && \
     mv /tmp/slaves $HADOOP_INSTALL/etc/hadoop/slaves && \
     mv /tmp/start-hadoop.sh ~/start-hadoop.sh && \
-    mv /tmp/run-wordcount.sh ~/run-wordcount.sh && \ 
-    mv /tmp/start-ssh.sh ~/start-ssh.sh
+    mv /tmp/run-wordcount.sh ~/run-wordcount.sh
 
 RUN chmod +x ~/start-hadoop.sh && \
     chmod +x ~/run-wordcount.sh && \
-    chmod +x ~/start-ssh.sh && \
     chmod +x $HADOOP_INSTALL/sbin/start-dfs.sh && \
     chmod +x $HADOOP_INSTALL/sbin/start-yarn.sh && \
     chmod 1777 /tmp
 
 # format namenode
 RUN /usr/local/hadoop/bin/hdfs namenode -format
 
-CMD '/root/start-ssh.sh'; 'bash'
+CMD [ "sh", "-c", "service ssh start; bash"]
diff --git a/hadoop-master/files/start-ssh.sh b/hadoop-master/files/start-ssh.sh
diff --git a/hadoop-slave/Dockerfile b/hadoop-slave/Dockerfile
@@ -12,9 +12,6 @@ RUN mkdir $HADOOP_INSTALL/logs
 RUN mv /tmp/hdfs-site.xml $HADOOP_INSTALL/etc/hadoop/hdfs-site.xml && \
     mv /tmp/core-site.xml $HADOOP_INSTALL/etc/hadoop/core-site.xml && \
     mv /tmp/mapred-site.xml $HADOOP_INSTALL/etc/hadoop/mapred-site.xml && \
-    mv /tmp/yarn-site.xml $HADOOP_INSTALL/etc/hadoop/yarn-site.xml 
+    mv /tmp/yarn-site.xml $HADOOP_INSTALL/etc/hadoop/yarn-site.xml
 
-RUN mv /tmp/start-ssh.sh ~/start-ssh.sh && \
-    chmod +x ~/start-ssh.sh
-
-CMD '/root/start-ssh.sh'; 'bash'
+CMD [ "sh", "-c", "service ssh start; bash"]
diff --git a/hadoop-slave/files/start-ssh.sh b/hadoop-slave/files/start-ssh.sh