Commit 38ae459b authored by Ilsiyar Gaynutdinov's avatar Ilsiyar Gaynutdinov

changed License to modified BSD

parent c2695493
...@@ -38,12 +38,12 @@ help: ...@@ -38,12 +38,12 @@ help:
@grep -E '^[a-zA-Z0-9_%/-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @grep -E '^[a-zA-Z0-9_%/-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
arch_patch/%: ## apply hardware architecture specific patches to the Dockerfile arch_patch/%: ## apply hardware architecture specific patches to the Dockerfile
if [ -e ./$(notdir $@)/Dockerfile.orig ]; then \
cp -f ./$(notdir $@)/Dockerfile.orig ./$(notdir $@)/Dockerfile;\
else\
cp -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.orig;\
fi;\
if [ -e ./$(notdir $@)/Dockerfile.$(ARCH).patch ]; then \ if [ -e ./$(notdir $@)/Dockerfile.$(ARCH).patch ]; then \
if [ -e ./$(notdir $@)/Dockerfile.orig ]; then \
cp -f ./$(notdir $@)/Dockerfile.orig ./$(notdir $@)/Dockerfile;\
else\
cp -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.orig;\
fi;\
patch -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.$(ARCH).patch; \ patch -f ./$(notdir $@)/Dockerfile ./$(notdir $@)/Dockerfile.$(ARCH).patch; \
fi fi
......
# Copyright (c) IBM Corporation 2016 # Copyright (c) IBM Corporation 2016
# Distributed under the terms of the Apache V2 License, # Distributed under the terms of the Modified BSD License.
# https://opensource.org/licenses/Apache-2.0
# Ubuntu image # Ubuntu image
FROM ppc64le/ubuntu:trusty FROM ppc64le/ubuntu:trusty
......
--- Dockerfile 2016-12-07 14:36:13.998198003 -0500 --- Dockerfile 2016-12-08 12:23:10.288198002 -0500
+++ Dockerfile.ppc64le 2016-12-07 14:35:24.928197537 -0500 +++ Dockerfile.ppc64le 2016-12-08 12:25:01.518197999 -0500
@@ -1,36 +1,44 @@ @@ -1,36 +1,43 @@
-# Copyright (c) Jupyter Development Team. -# Copyright (c) Jupyter Development Team.
-# Distributed under the terms of the Modified BSD License.
+# Copyright (c) IBM Corporation 2016 +# Copyright (c) IBM Corporation 2016
+# Distributed under the terms of the Apache V2 License, # Distributed under the terms of the Modified BSD License.
+# https://opensource.org/licenses/Apache-2.0
-# Debian Jessie image released 2016 May 03. -# Debian Jessie image released 2016 May 03.
-FROM debian@sha256:32a225e412babcd54c0ea777846183c61003d125278882873fb2bc97f9057c51 -FROM debian@sha256:32a225e412babcd54c0ea777846183c61003d125278882873fb2bc97f9057c51
...@@ -64,7 +62,7 @@ ...@@ -64,7 +62,7 @@
# Configure environment # Configure environment
ENV CONDA_DIR /opt/conda ENV CONDA_DIR /opt/conda
@@ -58,11 +66,10 @@ @@ -58,11 +65,10 @@
# Install conda as jovyan # Install conda as jovyan
RUN cd /tmp && \ RUN cd /tmp && \
mkdir -p $CONDA_DIR && \ mkdir -p $CONDA_DIR && \
...@@ -80,7 +78,7 @@ ...@@ -80,7 +78,7 @@
$CONDA_DIR/bin/conda config --system --add channels conda-forge && \ $CONDA_DIR/bin/conda config --system --add channels conda-forge && \
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
conda clean -tipsy conda clean -tipsy
@@ -72,15 +79,16 @@ @@ -72,15 +78,16 @@
RUN echo "jpeg 8*" >> /opt/conda/conda-meta/pinned RUN echo "jpeg 8*" >> /opt/conda/conda-meta/pinned
# Install Jupyter notebook as jovyan # Install Jupyter notebook as jovyan
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment