diff options
| -rw-r--r-- | .gitmodules | 12 | ||||
| -rw-r--r-- | LICENSE | 191 | ||||
| m--------- | ext/containerd | 0 | ||||
| m--------- | ext/docker-ce | 0 | ||||
| m--------- | ext/runc | 0 | ||||
| -rw-r--r-- | packaging/containerd.tar.bz2 | bin | 889558 -> 0 bytes | |||
| -rw-r--r-- | packaging/docker-ce.tar.bz2 | bin | 24061883 -> 0 bytes | |||
| -rwxr-xr-x | packaging/docker-engine.spec | 118 | ||||
| -rw-r--r-- | packaging/docker-engine.tar.bz2 | bin | 0 -> 9348563 bytes | |||
| -rw-r--r-- | packaging/gitmodules.sh | 26 | ||||
| -rw-r--r-- | packaging/go1.8.3.linux-amd64.tar.gz | bin | 62441961 -> 0 bytes | |||
| -rw-r--r-- | packaging/go1.8.3.linux-armv7.tar.gz | bin | 62254683 -> 0 bytes | |||
| -rw-r--r-- | packaging/runc.tar.bz2 | bin | 719537 -> 0 bytes |
13 files changed, 209 insertions, 138 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2da4420..0000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "ext/containerd"] - path = ext/containerd - url = https://github.com/docker/containerd.git - branch = 6e23458c129b551d5c9871e5174f6b1b7f6d1170 -[submodule "ext/docker-ce"] - path = ext/docker-ce - url = https://github.sec.samsung.net/RS7-DeviceManagement/docker-ce.git - branch = v17.06.1-ce-dz -[submodule "ext/runc"] - path = ext/runc - url = https://github.com/docker/runc.git - branch = 810190ceaa507aa2727d7ae6f4790c76ec150bd2 @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + https://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 + + Copyright 2013-2017 Docker, Inc. + + 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 + + https://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/ext/containerd b/ext/containerd deleted file mode 160000 -Subproject 6e23458c129b551d5c9871e5174f6b1b7f6d117 diff --git a/ext/docker-ce b/ext/docker-ce deleted file mode 160000 -Subproject 9f615b9d89297995d573dfdf70d07ab4233723b diff --git a/ext/runc b/ext/runc deleted file mode 160000 -Subproject 810190ceaa507aa2727d7ae6f4790c76ec150bd diff --git a/packaging/containerd.tar.bz2 b/packaging/containerd.tar.bz2 Binary files differdeleted file mode 100644 index 753e938..0000000 --- a/packaging/containerd.tar.bz2 +++ /dev/null diff --git a/packaging/docker-ce.tar.bz2 b/packaging/docker-ce.tar.bz2 Binary files differdeleted file mode 100644 index 1629743..0000000 --- a/packaging/docker-ce.tar.bz2 +++ /dev/null diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec index 355eb3d..047607a 100755 --- a/packaging/docker-engine.spec +++ b/packaging/docker-engine.spec @@ -1,11 +1,8 @@ -%define docker_path /src/github.com/docker -%define runc_path /src/github.com/opencontainers -%define container_path /src/github.com/containerd %define go_version 1.8.3 -%define orig_version %{version}-ce +%define orig_version 17.06.0-dev Name: docker-engine -Version: 17.06.1 +Version: 0.7.0 Release: 0 Summary: The open-source application container engine Group: Tools/Docker @@ -16,11 +13,7 @@ Source0: %{name}.tar.gz Source1: %{name}.manifest Source2: %{name}.service Source3: %{name}.socket -Source11: go1.8.3.linux-amd64.tar.gz -Source12: go1.8.3.linux-armv7.tar.gz -Source13: docker-ce.tar.bz2 -Source14: containerd.tar.bz2 -Source15: runc.tar.bz2 +Source11: docker-engine.tar.bz2 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -38,112 +31,37 @@ for deploying and scaling web apps, databases, and backend services without depending on a particular stack or provider. - %prep %setup -q -%ifarch armv7l -cp %{SOURCE12} . -tar -zxf %{SOURCE12} -rm -f %{_builddir}/%{name}-%{version}/go%{go_version}.linux-armv7.tar.gz -%endif -%ifarch x86_64 -cp %{SOURCE11} . -tar -zxf %{SOURCE11} -rm -f %{_builddir}/%{name}-%{version}/go%{go_version}.linux-amd64.tar.gz -%endif chmod g-w %_sourcedir/* cp %{SOURCE1} ./%{name}.manifest -# docker-ce tar file -cp %{SOURCE13} . -tar -xvf %{SOURCE13} - -# containerd tar file -cp %{SOURCE14} . -tar -xvf %{SOURCE14} - -# runc tar file -cp %{SOURCE15} . -tar -xvf %{SOURCE15} - -## set docker build folder -mkdir -p .%docker_path/ -mkdir -p .%docker_path/engine -mkdir -p .%docker_path/cli -mkdir -p .%container_path/containerd -mkdir -p .%runc_path/ -mkdir -p .%runc_path/runc - -cd ext/docker-ce/components/engine -mv `ls . | grep -v packaging | grep -v src` ../../../..%docker_path/engine -cd ../cli/ -mv `ls . | grep -v packaging | grep -v src` ../../../..%docker_path/cli -cd ../../../containerd/ -mv `ls . | grep -v packaging | grep -v src` ../..%container_path/containerd -cd ../runc/ -mv `ls . | grep -v packaging | grep -v src` ../..%runc_path/runc -cd ../../ +# docker-engine tar file +cp %{SOURCE11} . +tar -xvf %{SOURCE11} ## service cp %{SOURCE2} ./%{name}.services cp %{SOURCE3} ./%{name}.socket -%build -cd .%docker_path/engine -export GOROOT=%{_builddir}/%{name}-%{version}/go -export PATH=$PATH:%{_builddir}/%{name}-%{version}/go/bin -export GOPATH=%{_builddir}/%{name}-%{version} -export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper' - -go env -echo "skip docker daemon build" -echo "will be used from docker-ec build result" -###echo 'docker daemon' -###export CGO_ENABLED=1 -###AUTO_GOPATH=1 ./hack/make.sh dynbinary - -echo 'docker cli' -cd ../cli -make binary - -export BUILDTAGS=no_btrfs -echo 'containerd build' -cd ../../containerd/containerd -make - -echo 'runc build' -cd ../../opencontainers/runc -make all BUILDTAGS="" - %install rm -rf %{buildroot} # install binary install -d $RPM_BUILD_ROOT/%{_bindir} -install -p -m 755 .%docker_path/cli/build/docker-linux-arm $RPM_BUILD_ROOT/%{_bindir}/docker -install -p -m 755 .%docker_path/engine/bundles/%{orig_version}/dynbinary-daemon/dockerd-%{orig_version} $RPM_BUILD_ROOT/%{_bindir}/dockerd -install -p -m 755 .%runc_path/runc/runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc -install -p -m 755 .%container_path/containerd/bin/containerd $RPM_BUILD_ROOT/%{_bindir}/docker-containerd -install -p -m 755 .%container_path/containerd/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim -install -p -m 755 .%container_path/containerd/bin/ctr $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr -mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -### mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants -### install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/system/%{name}.service -### ln -s ../%{name}.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/ -### install -m 0644 %SOURCE3 %{buildroot}/usr/lib/systemd/system/%{name}.socket -### ln -s ../%{name}.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/ +install -p -m 755 ./docker-engine/docker $RPM_BUILD_ROOT/%{_bindir}/docker + +%post +ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-containerd +ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr +ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim +ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-proxy +ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-runc +ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/dockerd + %files %manifest %{name}.manifest %defattr(-,root,root,-) -/%{_bindir}/docker -/%{_bindir}/dockerd -/%{_bindir}/docker-containerd -/%{_bindir}/docker-containerd-shim -/%{_bindir}/docker-containerd-ctr -/%{_bindir}/docker-runc -### /usr/lib/systemd/system/%{name}.service -### /usr/lib/systemd/system/multi-user.target.wants/%{name}.service -### /usr/lib/systemd/system/%{name}.socket -### /usr/lib/systemd/system/sockets.target.wants/%{name}.socket -%license .%docker_path/engine/LICENSE +/%{_bindir}/docker* +%license ./LICENSE diff --git a/packaging/docker-engine.tar.bz2 b/packaging/docker-engine.tar.bz2 Binary files differnew file mode 100644 index 0000000..c111b51 --- /dev/null +++ b/packaging/docker-engine.tar.bz2 diff --git a/packaging/gitmodules.sh b/packaging/gitmodules.sh deleted file mode 100644 index b89a132..0000000 --- a/packaging/gitmodules.sh +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh -# @author: Philippe Coval <mailto:philippe.coval@eurogiciel.fr> -# @description: manage git submodules with git-build-package-rpm - -set -x -set -e - -cat .gitmodules || return 1 - -git submodule status | awk '{ print $2 }' | while read dir ; do - name=$(basename "$dir" ) - echo "name=" - echo "dir=$dir" -# remove submodule init and upste script at gitmodule.sh file -# it works with current .gitmodules file and .gitmodules was made from previous tar files -# so it should not executed when push with new commit -# git submodule init -# git submodule update - - tar cjvf "./packaging/${name}.tar.bz2" "${dir}" - -cat<<EOF -# Please add "SourceN: $name.tar.bz2" and "%setup -q -a N" to "packaging/*.spec" -EOF - -done diff --git a/packaging/go1.8.3.linux-amd64.tar.gz b/packaging/go1.8.3.linux-amd64.tar.gz Binary files differdeleted file mode 100644 index 435aa8f..0000000 --- a/packaging/go1.8.3.linux-amd64.tar.gz +++ /dev/null diff --git a/packaging/go1.8.3.linux-armv7.tar.gz b/packaging/go1.8.3.linux-armv7.tar.gz Binary files differdeleted file mode 100644 index 26e9b10..0000000 --- a/packaging/go1.8.3.linux-armv7.tar.gz +++ /dev/null diff --git a/packaging/runc.tar.bz2 b/packaging/runc.tar.bz2 Binary files differdeleted file mode 100644 index 33b8f86..0000000 --- a/packaging/runc.tar.bz2 +++ /dev/null |