You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ha...@apache.org on 2018/01/23 18:12:13 UTC

[incubator-mxnet] branch master updated: [ReviewRequired] Adding License files for MXNet Dockerfiles. (#9500)

This is an automated email from the ASF dual-hosted git repository.

haibin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 25f7617  [ReviewRequired] Adding License files for MXNet Dockerfiles. (#9500)
25f7617 is described below

commit 25f761749508e7947f6a0a51ae41a5c53b3a8425
Author: mbaijal <30...@users.noreply.github.com>
AuthorDate: Tue Jan 23 10:12:05 2018 -0800

    [ReviewRequired] Adding License files for MXNet Dockerfiles. (#9500)
    
    * License to dockerfiles
    
    * Remove Apache License from Scala Dockerfile
    
    * Addded the docker/dockerfiles to whitelist because teh script adds license header to the scala dockerfile
---
 docker/Dockerfiles/Dockerfile.in.scala | 19 -------------------
 docker/Dockerfiles/License.md          | 20 ++++++++++++++++++++
 docker_multiarch/License.md            | 20 ++++++++++++++++++++
 tools/license_header.py                |  1 +
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/docker/Dockerfiles/Dockerfile.in.scala b/docker/Dockerfiles/Dockerfile.in.scala
index 1fe9365..6898126 100644
--- a/docker/Dockerfiles/Dockerfile.in.scala
+++ b/docker/Dockerfiles/Dockerfile.in.scala
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
 # -*- mode: dockerfile -*-
 # part of the dockerfile to install the scala binding
 
diff --git a/docker/Dockerfiles/License.md b/docker/Dockerfiles/License.md
new file mode 100644
index 0000000..614c582
--- /dev/null
+++ b/docker/Dockerfiles/License.md
@@ -0,0 +1,20 @@
+## Dockerfiles License
+
+### All Dockerfiles in this directory are provided under an Apache 2.0 license. 
+
+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.
\ No newline at end of file
diff --git a/docker_multiarch/License.md b/docker_multiarch/License.md
new file mode 100644
index 0000000..614c582
--- /dev/null
+++ b/docker_multiarch/License.md
@@ -0,0 +1,20 @@
+## Dockerfiles License
+
+### All Dockerfiles in this directory are provided under an Apache 2.0 license. 
+
+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.
\ No newline at end of file
diff --git a/tools/license_header.py b/tools/license_header.py
index 6c79222..d448ecd 100644
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -57,6 +57,7 @@ _LICENSE_PATTERNS = ['Licensed to the Apache Software Foundation']
 # the folders or files that will be ignored
 _WHITE_LIST = ['R-package/',
                'cub/',
+               'docker/Dockerfiles',
                'dlpack/',
                'dmlc-core/',
                'mshadow/',

-- 
To stop receiving notification emails like this one, please contact
haibin@apache.org.