You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/11 16:56:08 UTC
[40/59] [abbrv] ignite git commit: Changed docker file.
Changed docker file.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec1ffe13
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec1ffe13
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec1ffe13
Branch: refs/heads/ignite-843-rc2
Commit: ec1ffe13465221c497e603eb51dc690bc8a16f3d
Parents: 9a02acb
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Dec 11 16:47:57 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Dec 11 16:47:57 2015 +0300
----------------------------------------------------------------------
modules/docker/1.0.0/Dockerfile | 40 +++++++++++++++++++++
modules/docker/1.0.0/run.sh | 50 ++++++++++++++++++++++++++
modules/docker/1.1.0/Dockerfile | 40 +++++++++++++++++++++
modules/docker/1.1.0/run.sh | 50 ++++++++++++++++++++++++++
modules/docker/1.2.0/Dockerfile | 40 +++++++++++++++++++++
modules/docker/1.2.0/run.sh | 50 ++++++++++++++++++++++++++
modules/docker/1.3.0/Dockerfile | 40 +++++++++++++++++++++
modules/docker/1.3.0/run.sh | 50 ++++++++++++++++++++++++++
modules/docker/1.4.0/Dockerfile | 40 +++++++++++++++++++++
modules/docker/1.4.0/run.sh | 50 ++++++++++++++++++++++++++
modules/docker/Dockerfile | 41 +++++++---------------
modules/docker/build_users_libs.sh | 39 ---------------------
modules/docker/download_ignite.sh | 49 --------------------------
modules/docker/execute.sh | 62 ---------------------------------
modules/docker/run.sh | 36 +++++++++++++------
15 files changed, 489 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.0.0/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/docker/1.0.0/Dockerfile b/modules/docker/1.0.0/Dockerfile
new file mode 100644
index 0000000..79c35c8
--- /dev/null
+++ b/modules/docker/1.0.0/Dockerfile
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Start from a Java image.
+FROM java:7
+
+# Ignite version
+ENV IGNITE_VERSION 1.0.0-incubating
+
+WORKDIR /opt/ignite
+
+ADD http://www.us.apache.org/dist/ignite/1.0.0/ignite-fabric-1.0.0-incubating.zip /opt/ignite/ignite.zip
+
+# Ignite home
+ENV IGNITE_HOME /opt/ignite/ignite-fabric-1.0.0-incubating
+
+RUN unzip ignite.zip
+
+RUN rm ignite.zip
+
+# Copy sh files and set permission
+ADD ./run.sh $IGNITE_HOME/
+
+RUN chmod +x $IGNITE_HOME/run.sh
+
+CMD $IGNITE_HOME/run.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.0.0/run.sh
----------------------------------------------------------------------
diff --git a/modules/docker/1.0.0/run.sh b/modules/docker/1.0.0/run.sh
new file mode 100644
index 0000000..dbf2871
--- /dev/null
+++ b/modules/docker/1.0.0/run.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if [ ! -z "$OPTION_LIBS" ]; then
+ IFS=, LIBS_LIST=("$OPTION_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ cp -r $IGNITE_HOME/libs/optional/"$lib"/* \
+ $IGNITE_HOME/libs/
+ done
+fi
+
+if [ ! -z "$EXTERNAL_LIBS" ]; then
+ IFS=, LIBS_LIST=("$EXTERNAL_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ echo $lib >> temp
+ done
+
+ wget -i temp -P $IGNITE_HOME/libs
+
+ rm temp
+fi
+
+QUIET=""
+
+if [ "$IGNITE_QUIET" = "false" ]; then
+ QUIET="-v"
+fi
+
+if [ -z $CONFIG_URI ]; then
+ $IGNITE_HOME/bin/ignite.sh $QUIET
+else
+ $IGNITE_HOME/bin/ignite.sh $QUIET $CONFIG_URI
+fi
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.1.0/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/docker/1.1.0/Dockerfile b/modules/docker/1.1.0/Dockerfile
new file mode 100644
index 0000000..f132309
--- /dev/null
+++ b/modules/docker/1.1.0/Dockerfile
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Start from a Java image.
+FROM java:7
+
+# Ignite version
+ENV IGNITE_VERSION 1.1.0-incubating
+
+WORKDIR /opt/ignite
+
+ADD http://www.us.apache.org/dist/ignite/1.1.0/apache-ignite-fabric-1.1.0-incubating-bin.zip /opt/ignite/ignite.zip
+
+# Ignite home
+ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-1.1.0-incubating-bin
+
+RUN unzip ignite.zip
+
+RUN rm ignite.zip
+
+# Copy sh files and set permission
+ADD ./run.sh $IGNITE_HOME/
+
+RUN chmod +x $IGNITE_HOME/run.sh
+
+CMD $IGNITE_HOME/run.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.1.0/run.sh
----------------------------------------------------------------------
diff --git a/modules/docker/1.1.0/run.sh b/modules/docker/1.1.0/run.sh
new file mode 100644
index 0000000..dbf2871
--- /dev/null
+++ b/modules/docker/1.1.0/run.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if [ ! -z "$OPTION_LIBS" ]; then
+ IFS=, LIBS_LIST=("$OPTION_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ cp -r $IGNITE_HOME/libs/optional/"$lib"/* \
+ $IGNITE_HOME/libs/
+ done
+fi
+
+if [ ! -z "$EXTERNAL_LIBS" ]; then
+ IFS=, LIBS_LIST=("$EXTERNAL_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ echo $lib >> temp
+ done
+
+ wget -i temp -P $IGNITE_HOME/libs
+
+ rm temp
+fi
+
+QUIET=""
+
+if [ "$IGNITE_QUIET" = "false" ]; then
+ QUIET="-v"
+fi
+
+if [ -z $CONFIG_URI ]; then
+ $IGNITE_HOME/bin/ignite.sh $QUIET
+else
+ $IGNITE_HOME/bin/ignite.sh $QUIET $CONFIG_URI
+fi
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.2.0/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/docker/1.2.0/Dockerfile b/modules/docker/1.2.0/Dockerfile
new file mode 100644
index 0000000..b4b1a4a
--- /dev/null
+++ b/modules/docker/1.2.0/Dockerfile
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Start from a Java image.
+FROM java:7
+
+# Ignite version
+ENV IGNITE_VERSION 1.2.0-incubating
+
+WORKDIR /opt/ignite
+
+ADD http://www.us.apache.org/dist/ignite/1.2.0/apache-ignite-fabric-1.2.0-incubating-bin.zip /opt/ignite/ignite.zip
+
+# Ignite home
+ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-1.2.0-incubating-bin
+
+RUN unzip ignite.zip
+
+RUN rm ignite.zip
+
+# Copy sh files and set permission
+ADD ./run.sh $IGNITE_HOME/
+
+RUN chmod +x $IGNITE_HOME/run.sh
+
+CMD $IGNITE_HOME/run.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.2.0/run.sh
----------------------------------------------------------------------
diff --git a/modules/docker/1.2.0/run.sh b/modules/docker/1.2.0/run.sh
new file mode 100644
index 0000000..dbf2871
--- /dev/null
+++ b/modules/docker/1.2.0/run.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if [ ! -z "$OPTION_LIBS" ]; then
+ IFS=, LIBS_LIST=("$OPTION_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ cp -r $IGNITE_HOME/libs/optional/"$lib"/* \
+ $IGNITE_HOME/libs/
+ done
+fi
+
+if [ ! -z "$EXTERNAL_LIBS" ]; then
+ IFS=, LIBS_LIST=("$EXTERNAL_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ echo $lib >> temp
+ done
+
+ wget -i temp -P $IGNITE_HOME/libs
+
+ rm temp
+fi
+
+QUIET=""
+
+if [ "$IGNITE_QUIET" = "false" ]; then
+ QUIET="-v"
+fi
+
+if [ -z $CONFIG_URI ]; then
+ $IGNITE_HOME/bin/ignite.sh $QUIET
+else
+ $IGNITE_HOME/bin/ignite.sh $QUIET $CONFIG_URI
+fi
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.3.0/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/docker/1.3.0/Dockerfile b/modules/docker/1.3.0/Dockerfile
new file mode 100644
index 0000000..eade9d9
--- /dev/null
+++ b/modules/docker/1.3.0/Dockerfile
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Start from a Java image.
+FROM java:7
+
+# Ignite version
+ENV IGNITE_VERSION 1.3.0-incubating
+
+WORKDIR /opt/ignite
+
+ADD http://www.us.apache.org/dist/ignite/1.3.0/apache-ignite-fabric-1.3.0-incubating-bin.zip /opt/ignite/ignite.zip
+
+# Ignite home
+ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-1.3.0-incubating-bin
+
+RUN unzip ignite.zip
+
+RUN rm ignite.zip
+
+# Copy sh files and set permission
+ADD ./run.sh $IGNITE_HOME/
+
+RUN chmod +x $IGNITE_HOME/run.sh
+
+CMD $IGNITE_HOME/run.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.3.0/run.sh
----------------------------------------------------------------------
diff --git a/modules/docker/1.3.0/run.sh b/modules/docker/1.3.0/run.sh
new file mode 100644
index 0000000..dbf2871
--- /dev/null
+++ b/modules/docker/1.3.0/run.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if [ ! -z "$OPTION_LIBS" ]; then
+ IFS=, LIBS_LIST=("$OPTION_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ cp -r $IGNITE_HOME/libs/optional/"$lib"/* \
+ $IGNITE_HOME/libs/
+ done
+fi
+
+if [ ! -z "$EXTERNAL_LIBS" ]; then
+ IFS=, LIBS_LIST=("$EXTERNAL_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ echo $lib >> temp
+ done
+
+ wget -i temp -P $IGNITE_HOME/libs
+
+ rm temp
+fi
+
+QUIET=""
+
+if [ "$IGNITE_QUIET" = "false" ]; then
+ QUIET="-v"
+fi
+
+if [ -z $CONFIG_URI ]; then
+ $IGNITE_HOME/bin/ignite.sh $QUIET
+else
+ $IGNITE_HOME/bin/ignite.sh $QUIET $CONFIG_URI
+fi
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.4.0/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/docker/1.4.0/Dockerfile b/modules/docker/1.4.0/Dockerfile
new file mode 100644
index 0000000..41f6a68
--- /dev/null
+++ b/modules/docker/1.4.0/Dockerfile
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Start from a Java image.
+FROM java:7
+
+# Ignite version
+ENV IGNITE_VERSION 1.4.0
+
+WORKDIR /opt/ignite
+
+ADD http://www.us.apache.org/dist/ignite/1.4.0/apache-ignite-fabric-1.4.0-bin.zip /opt/ignite/ignite.zip
+
+# Ignite home
+ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-1.4.0-bin
+
+RUN unzip ignite.zip
+
+RUN rm ignite.zip
+
+# Copy sh files and set permission
+ADD ./run.sh $IGNITE_HOME/
+
+RUN chmod +x $IGNITE_HOME/run.sh
+
+CMD $IGNITE_HOME/run.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/1.4.0/run.sh
----------------------------------------------------------------------
diff --git a/modules/docker/1.4.0/run.sh b/modules/docker/1.4.0/run.sh
new file mode 100644
index 0000000..dbf2871
--- /dev/null
+++ b/modules/docker/1.4.0/run.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if [ ! -z "$OPTION_LIBS" ]; then
+ IFS=, LIBS_LIST=("$OPTION_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ cp -r $IGNITE_HOME/libs/optional/"$lib"/* \
+ $IGNITE_HOME/libs/
+ done
+fi
+
+if [ ! -z "$EXTERNAL_LIBS" ]; then
+ IFS=, LIBS_LIST=("$EXTERNAL_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ echo $lib >> temp
+ done
+
+ wget -i temp -P $IGNITE_HOME/libs
+
+ rm temp
+fi
+
+QUIET=""
+
+if [ "$IGNITE_QUIET" = "false" ]; then
+ QUIET="-v"
+fi
+
+if [ -z $CONFIG_URI ]; then
+ $IGNITE_HOME/bin/ignite.sh $QUIET
+else
+ $IGNITE_HOME/bin/ignite.sh $QUIET $CONFIG_URI
+fi
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/docker/Dockerfile b/modules/docker/Dockerfile
index 11e2e3d..11be2b4 100644
--- a/modules/docker/Dockerfile
+++ b/modules/docker/Dockerfile
@@ -15,41 +15,26 @@
# limitations under the License.
#
-# Start from a Debian image.
-FROM debian:8
+# Start from a Java image.
+FROM java:7
-# Install tools.
-RUN apt-get update && apt-get install -y --fix-missing \
- wget \
- dstat \
- maven \
- git
+# Ignite version
+ENV IGNITE_VERSION 1.5.0-b1
-# Intasll Oracle JDK.
-RUN mkdir /opt/jdk
+WORKDIR /opt/ignite
-RUN wget --header "Cookie: oraclelicense=accept-securebackup-cookie" \
- http://download.oracle.com/otn-pub/java/jdk/7u76-b13/jdk-7u76-linux-x64.tar.gz
+ADD http://www.us.apache.org/dist/ignite/1.5.0-b1/apache-ignite-fabric-1.5.0-b1-bin.zip /opt/ignite/ignite.zip
-RUN tar -zxf jdk-7u76-linux-x64.tar.gz -C /opt/jdk
+# Ignite home
+ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-1.5.0-b1-bin
-RUN rm jdk-7u76-linux-x64.tar.gz
+RUN unzip ignite.zip
-RUN update-alternatives --install /usr/bin/java java /opt/jdk/jdk1.7.0_76/bin/java 100
-
-RUN update-alternatives --install /usr/bin/javac javac /opt/jdk/jdk1.7.0_76/bin/javac 100
-
-# Sets java variables.
-ENV JAVA_HOME /opt/jdk/jdk1.7.0_76/
-
-# Create working directory
-RUN mkdir /home/ignite_home
-
-WORKDIR /home/ignite_home
+RUN rm ignite.zip
# Copy sh files and set permission
-ADD *.sh ./
+ADD ./run.sh $IGNITE_HOME/
-RUN chmod +x *.sh
+RUN chmod +x $IGNITE_HOME/run.sh
-CMD ./run.sh
\ No newline at end of file
+CMD $IGNITE_HOME/run.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/build_users_libs.sh
----------------------------------------------------------------------
diff --git a/modules/docker/build_users_libs.sh b/modules/docker/build_users_libs.sh
deleted file mode 100644
index 4d37187..0000000
--- a/modules/docker/build_users_libs.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-if [ -z $GIT_REPO ]; then
- echo Users git repo is not provided.
-
- exit 0
-fi
-
-git clone $GIT_REPO user-repo
-
-cd user-repo
-
-if [ ! -z $GIT_BRANCH ]; then
- git checkout $GIT_BRANCH
-fi
-
-if [ ! -z "$BUILD_CMD" ]; then
- echo "Starting to execute build command: $BUILD_CMD"
-
- eval "$BUILD_CMD"
-else
- mvn clean package
-fi
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/download_ignite.sh
----------------------------------------------------------------------
diff --git a/modules/docker/download_ignite.sh b/modules/docker/download_ignite.sh
deleted file mode 100644
index 8a91c59..0000000
--- a/modules/docker/download_ignite.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-function download {
- wget -O ignite.zip $1
-
- unzip ignite.zip -d ignite
-
- rm ignite.zip
-
- exit 0
-}
-
-if [ ! -z $IGNITE_URL ]; then
- download $IGNITE_URL
-fi
-
-if [ ! -z $IGNITE_VERSION ]; then
- if [[ $IGNITE_VERSION =~ [0-9]*\.[0-9]*\.0 ]]; then
- download http://apache-mirror.rbc.ru/pub/apache/ignite/${IGNITE_VERSION}/apache-ignite-fabric-${IGNITE_VERSION}-bin.zip
- else
- download http://www.gridgain.com/media/gridgain-community-fabric-${IGNITE_VERSION}.zip
- fi
-fi
-
-if [ -z $IGNITE_SOURCE ] || [ $IGNITE_SOURCE = "COMMUNITY" ]; then
- download http://tiny.cc/updater/download_community.php
-fi
-
-if [ $IGNITE_SOURCE = "APACHE" ]; then
- download http://tiny.cc/updater/download_ignite.php
-fi
-
-echo "Unsupported IGNITE_SOURCE type: ${IGNITE_SOURCE}"
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/execute.sh
----------------------------------------------------------------------
diff --git a/modules/docker/execute.sh b/modules/docker/execute.sh
deleted file mode 100644
index 8afba59..0000000
--- a/modules/docker/execute.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-if [ ! -z "$GIT_REPO" ]; then
- if [ -z "$LIB_PATTERN" ]; then
- find user-repo/ -regextype posix-extended -regex "user-repo/target/.*(jar|zip)$" -exec cp {} ignite/*/libs \;
- else
- find user-repo/ -regextype posix-extended -regex "$LIB_PATTERN" -exec cp {} ignite/*/libs \;
- fi
-fi
-
-if [ -z "$OPTION_LIBS" ]; then
- OPTION_LIBS="ignite-log4j"
-fi
-
-if [ ! -z "$OPTION_LIBS" ]; then
- IFS=, LIBS_LIST=("$OPTION_LIBS")
-
- for lib in ${LIBS_LIST[@]}; do
- cp -r ./ignite/*/libs/optional/"$lib"/* ./ignite/*/libs
- done
-fi
-
-# Try to download
-if [ ! -z "$IGNITE_CONFIG" ]; then
- wget -O ignite-config.xml "$IGNITE_CONFIG" 2>/dev/null
-
- RETVAL=$?
-
- [ $RETVAL -eq 0 ] && IGNITE_CONFIG=ignite-config.xml
-
- [ $RETVAL -ne 0 ] && rm ignite-config.xml && echo "Failed download config: $IGNITE_CONFIG. Try to load config from classpath."
-fi
-
-if [ ! -z "$EXEC_CMD" ]; then
- echo "Starting to execute command: $EXEC_CMD"
-
- eval "$EXEC_CMD"
-
- exit 0
-fi
-
-if [ -z "$IGNITE_CONFIG" ]; then
- ignite/*/bin/ignite.sh
-else
- ignite/*/bin/ignite.sh ignite-config.xml
-fi
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec1ffe13/modules/docker/run.sh
----------------------------------------------------------------------
diff --git a/modules/docker/run.sh b/modules/docker/run.sh
index 0f01c1c..dbf2871 100644
--- a/modules/docker/run.sh
+++ b/modules/docker/run.sh
@@ -16,19 +16,35 @@
# limitations under the License.
#
-if [ -z $SKIP_BUILD_LIBS ]; then
- ./build_users_libs.sh
+if [ ! -z "$OPTION_LIBS" ]; then
+ IFS=, LIBS_LIST=("$OPTION_LIBS")
- PROJ_VER=$(mvn -f user-repo/pom.xml dependency:list | grep ':ignite-core:jar:.*:' | \
- sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p')
+ for lib in ${LIBS_LIST[@]}; do
+ cp -r $IGNITE_HOME/libs/optional/"$lib"/* \
+ $IGNITE_HOME/libs/
+ done
+fi
+
+if [ ! -z "$EXTERNAL_LIBS" ]; then
+ IFS=, LIBS_LIST=("$EXTERNAL_LIBS")
+
+ for lib in ${LIBS_LIST[@]}; do
+ echo $lib >> temp
+ done
- if [ ! -z $PROJ_VER ]; then
- IGNITE_VERSION=$PROJ_VER
- fi
+ wget -i temp -P $IGNITE_HOME/libs
+
+ rm temp
fi
-if [ -z $SKIP_DOWNLOAD ]; then
- IGNITE_VERSION=$IGNITE_VERSION ./download_ignite.sh
+QUIET=""
+
+if [ "$IGNITE_QUIET" = "false" ]; then
+ QUIET="-v"
fi
-./execute.sh
\ No newline at end of file
+if [ -z $CONFIG_URI ]; then
+ $IGNITE_HOME/bin/ignite.sh $QUIET
+else
+ $IGNITE_HOME/bin/ignite.sh $QUIET $CONFIG_URI
+fi