Fixed "IGNITE-2092 Switched to the up-to-date java image which has build-in functionality to detect container CPU limitation".
Signed-off-by: nikolay_tikhonov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0919d9f4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0919d9f4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0919d9f4 Branch: refs/heads/ignite-3478 Commit: 0919d9f468e73b141783279267db6612664e6eb8 Parents: 0ab17ab Author: Maxim Neverov <[email protected]> Authored: Fri Sep 29 16:37:27 2017 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Fri Sep 29 16:38:08 2017 +0300 ---------------------------------------------------------------------- modules/docker/2.2.0/Dockerfile | 46 ++++++++++++++++++++++++++++++++ modules/docker/2.2.0/run.sh | 51 ++++++++++++++++++++++++++++++++++++ modules/docker/Dockerfile | 4 +-- 3 files changed, 99 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0919d9f4/modules/docker/2.2.0/Dockerfile ---------------------------------------------------------------------- diff --git a/modules/docker/2.2.0/Dockerfile b/modules/docker/2.2.0/Dockerfile new file mode 100644 index 0000000..4c09653 --- /dev/null +++ b/modules/docker/2.2.0/Dockerfile @@ -0,0 +1,46 @@ +# +# 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 openjdk:8 + +# Ignite version +ENV IGNITE_VERSION 2.2.0 + +# Ignite home +ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-${IGNITE_VERSION}-bin + +# Do not rely on anything provided by base image(s), but be explicit, if they are installed already it is noop then +RUN apt-get update && apt-get install -y --no-install-recommends \ + unzip \ + curl \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /opt/ignite + +RUN curl https://dist.apache.org/repos/dist/release/ignite/${IGNITE_VERSION}/apache-ignite-fabric-${IGNITE_VERSION}-bin.zip -o ignite.zip \ + && unzip ignite.zip \ + && rm ignite.zip + +# Copy sh files and set permission +COPY ./run.sh $IGNITE_HOME/ + +RUN chmod +x $IGNITE_HOME/run.sh + +CMD $IGNITE_HOME/run.sh + +EXPOSE 11211 47100 47500 49112 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/0919d9f4/modules/docker/2.2.0/run.sh ---------------------------------------------------------------------- diff --git a/modules/docker/2.2.0/run.sh b/modules/docker/2.2.0/run.sh new file mode 100644 index 0000000..3aafc30 --- /dev/null +++ b/modules/docker/2.2.0/run.sh @@ -0,0 +1,51 @@ +#!/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/0919d9f4/modules/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/modules/docker/Dockerfile b/modules/docker/Dockerfile index 6a0eecd..4c09653 100644 --- a/modules/docker/Dockerfile +++ b/modules/docker/Dockerfile @@ -16,10 +16,10 @@ # # Start from a Java image. -FROM java:8 +FROM openjdk:8 # Ignite version -ENV IGNITE_VERSION 2.1.0 +ENV IGNITE_VERSION 2.2.0 # Ignite home ENV IGNITE_HOME /opt/ignite/apache-ignite-fabric-${IGNITE_VERSION}-bin
