From f16db508e0fa9890e48c3266e1713f2196843cbb Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 09:10:44 -0300 Subject: [PATCH 1/5] Added legal comment --- Dockerfile | 15 ++ Jenkinsfile | 15 ++ LICENSE | 202 +++++++++++++++++++++++++ common.bash | 15 ++ conf/my.cnf | 15 ++ container_files/bin/fix-permissions.sh | 15 ++ container_files/bin/start.sh | 15 ++ tests/image.bats | 15 ++ tests/running.bats | 15 ++ 9 files changed, 322 insertions(+) create mode 100644 LICENSE mode change 100755 => 100644 container_files/bin/fix-permissions.sh mode change 100755 => 100644 container_files/bin/start.sh diff --git a/Dockerfile b/Dockerfile index 84ef71a..5dc4b67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID 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. +# FROM tier/centos7base # Define args and set a default value diff --git a/Jenkinsfile b/Jenkinsfile index b8c8a68..8f8505d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,18 @@ +// Licensed to the University Corporation for Advanced Internet Development, +// Inc. (UCAID) under one or more contributor license agreements. See the +// NOTICE file distributed with this work for additional information regarding +// copyright ownership. The UCAID 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. +// node('docker') { stage 'Checkout' diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/common.bash b/common.bash index 89fe631..23804f5 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID 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. +# maintainer="tier" imagename="mariadb" version="5.5" \ No newline at end of file diff --git a/conf/my.cnf b/conf/my.cnf index ab171a5..b4e68e5 100644 --- a/conf/my.cnf +++ b/conf/my.cnf @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID 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. +# # # These groups are read by MariaDB server. # Use it for options that only the server (but not clients) should see diff --git a/container_files/bin/fix-permissions.sh b/container_files/bin/fix-permissions.sh old mode 100755 new mode 100644 index 9b9615a..b6285e1 --- a/container_files/bin/fix-permissions.sh +++ b/container_files/bin/fix-permissions.sh @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID 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. +# #!/bin/sh log="/tmp/permissions.log" diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh old mode 100755 new mode 100644 index 9d86e91..d8880e4 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID 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. +# #!/bin/bash -x log="/tmp/start.log" diff --git a/tests/image.bats b/tests/image.bats index 85490ac..64e72f0 100644 --- a/tests/image.bats +++ b/tests/image.bats @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID 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. +# #!/usr/bin/env bats load ../common diff --git a/tests/running.bats b/tests/running.bats index ddb663d..bb95c9a 100644 --- a/tests/running.bats +++ b/tests/running.bats @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID 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. +# #!/usr/bin/env bats load ../common From 64dc5318aed321fb43fda65634ab4b0f428bb1d4 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 10:42:06 -0300 Subject: [PATCH 2/5] Update fix-permissions.sh --- container_files/bin/fix-permissions.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/container_files/bin/fix-permissions.sh b/container_files/bin/fix-permissions.sh index b6285e1..9c729a3 100644 --- a/container_files/bin/fix-permissions.sh +++ b/container_files/bin/fix-permissions.sh @@ -1,3 +1,4 @@ +#!/bin/sh # Licensed to the University Corporation for Advanced Internet Development, # Inc. (UCAID) under one or more contributor license agreements. See the # NOTICE file distributed with this work for additional information regarding @@ -13,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/bin/sh + log="/tmp/permissions.log" From 0e44abd0f392360e94608769fb268df1e651ac3b Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 10:42:18 -0300 Subject: [PATCH 3/5] Update start.sh --- container_files/bin/start.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index d8880e4..bd03a11 100644 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -1,3 +1,4 @@ +#!/bin/bash -x # Licensed to the University Corporation for Advanced Internet Development, # Inc. (UCAID) under one or more contributor license agreements. See the # NOTICE file distributed with this work for additional information regarding @@ -13,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/bin/bash -x + log="/tmp/start.log" From f03dc2a35a1335d71c3b0a010811b16ece4c4140 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 10:42:36 -0300 Subject: [PATCH 4/5] Update image.bats --- tests/image.bats | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/image.bats b/tests/image.bats index 64e72f0..0900eb4 100644 --- a/tests/image.bats +++ b/tests/image.bats @@ -1,3 +1,4 @@ +#!/usr/bin/env bats # Licensed to the University Corporation for Advanced Internet Development, # Inc. (UCAID) under one or more contributor license agreements. See the # NOTICE file distributed with this work for additional information regarding @@ -13,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env bats + load ../common From f0967e7a06972625c9eb754fc0b20dade9d7edba Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 10:42:52 -0300 Subject: [PATCH 5/5] Update running.bats --- tests/running.bats | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/running.bats b/tests/running.bats index bb95c9a..9bfa250 100644 --- a/tests/running.bats +++ b/tests/running.bats @@ -1,3 +1,4 @@ +#!/usr/bin/env bats # Licensed to the University Corporation for Advanced Internet Development, # Inc. (UCAID) under one or more contributor license agreements. See the # NOTICE file distributed with this work for additional information regarding @@ -13,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env bats + load ../common @@ -45,4 +46,4 @@ load ../common @test "UTF8 databases" { docker exec -i $imagename mysql -u root -h 127.0.0.1 --password=123321 -e 'show create database registry' | grep "DEFAULT CHARACTER SET utf8 COLLATE utf8_bin" -} \ No newline at end of file +}