Skip to content

Commit

Permalink
Merge pull request alibaba#659 from liulangwa/master
Browse files Browse the repository at this point in the history
去掉dockerfile中RUN命令中的空行,后面版本的docker可能会把它作为错误对待
  • Loading branch information
agapple authored Dec 1, 2018
2 parents 4945dca + 1565ef8 commit 9b01298
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@ RUN \
mkdir -p /home/admin && \
cp -R /tmp/docker/admin/* /home/admin/ && \
/bin/cp -f alidata/bin/lark-wait /usr/bin/lark-wait && \

mkdir -p /home/admin/manager && \
tar -xzvf /home/admin/manager.deployer-*.tar.gz -C /home/admin/manager && \
/bin/rm -f /home/admin/manager.deployer-*.tar.gz && \

mkdir -p /home/admin/node && \
tar -xzvf /home/admin/node.deployer-*.tar.gz -C /home/admin/node && \
/bin/rm -f /home/admin/node.deployer-*.tar.gz && \

mkdir -p home/admin/manager/logs && \
mkdir -p home/admin/node/logs && \
mkdir -p home/admin/zkData && \
Expand Down
1 change: 0 additions & 1 deletion docker/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ RUN \
groupadd -r mysql && useradd -r -g mysql mysql && \
yum -y install wget mysql-server --nogpgcheck && \
yum clean all && \

wget -q https://mirrors.tuna.tsinghua.edu.cn/apache/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz -O /home/admin/zookeeper-3.4.13.tar.gz && \
tar -xzvf /home/admin/zookeeper-*.tar.gz -C /home/admin && \
/bin/cp -rf /home/admin/zookeeper-3.4.13/conf/zoo_sample.cfg /home/admin/zookeeper-3.4.13/conf/zoo.cfg && \
Expand Down
1 change: 1 addition & 0 deletions lib/install.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash
mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc6 -Dversion=11.1.0.7.0 -Dpackaging=jar -Dfile=ojdbc6.jar -DgeneratePom=true
mvn install:install-file -DgroupId=org.jtester -DartifactId=jtester -Dversion=1.1.8 -Dpackaging=jar -DpomFile=jtester-1.1.8.pom -Dfile=jtester-1.1.8.jar -Dsources=jtester-1.1.8-sources.jar
mvn install:install-file -DgroupId=mockit -DartifactId=jmockit -Dversion=0.999.10 -Dpackaging=jar -DpomFile=jmockit-0.999.10.pom -Dfile=jmockit-0.999.10.jar -Dsources=jmockit-0.999.10-sources.jar
Expand Down

0 comments on commit 9b01298

Please sign in to comment.