From 98aca9c188cd78c808e4560f4827f8c70a8b7f4f Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 29 Jan 2016 10:12:37 +0100 Subject: [PATCH] bump v0.1.4 Signed-off-by: Antonio Murdaca --- LICENSE | 205 +++++++++++++++++++++++++++++++++++++++---- Makefile | 11 +-- README.md | 2 +- main.go | 2 +- skopeo.spec | 248 ---------------------------------------------------- 5 files changed, 196 insertions(+), 272 deletions(-) delete mode 100644 skopeo.spec diff --git a/LICENSE b/LICENSE index 578b98a8..e2e6ae04 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,191 @@ -Copyright (c) 2016 Antonio Murdaca -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + 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 2016 Antonio Murdaca + + 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/Makefile b/Makefile index 3aaa4e0f..76c7ee0e 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,9 @@ export GO15VENDOREXPERIMENT=1 -BINDIR=${DESTDIR}/usr/bin/ -MANDIR=${DESTDIR}/usr/share/man +PREFIX ?= ${DESTDIR}/usr +INSTALLDIR=${PREFIX}/bin +MANINSTALLDIR=${PREFIX}/share/man GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) DOCKER_IMAGE := skopeo-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH)) @@ -31,11 +32,11 @@ clean: rm -f skopeo.1 install: install-binary - install -m 644 skopeo.1 ${MANDIR}/man1/ + install -m 644 skopeo.1 ${MANINSTALLDIR}/man1/ install-binary: - install -d -m 0755 ${BINDIR} - install -m 755 skopeo ${BINDIR} + install -d -m 0755 ${INSTALLDIR} + install -m 755 skopeo ${INSTALLDIR} man: go-md2man -in man/skopeo.1.md -out skopeo.1 diff --git a/README.md b/README.md index f381da0c..a61af908 100644 --- a/README.md +++ b/README.md @@ -120,4 +120,4 @@ NOT TODO License - -MIT +ASL 2.0 diff --git a/main.go b/main.go index 5f5953f9..f9815560 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( ) const ( - version = "0.1.4-dev" + version = "0.1.4" usage = "inspect images on a registry" ) diff --git a/skopeo.spec b/skopeo.spec deleted file mode 100644 index 1b0852eb..00000000 --- a/skopeo.spec +++ /dev/null @@ -1,248 +0,0 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 1 -%global with_debug 1 -%global with_check 0 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 1 -%global with_debug 1 -%global with_check 0 -%global with_unit_test 0 -%endif - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%global provider github -%global provider_tld com -%global project runcom -%global repo skopeo -# https://github.com/runcom/skopeo -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit fdb5cac7f5af50ae5b1e3424965c31600d86232c -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: skopeo -Version: 0.1.3 -Release: 0.1.git%{shortcommit}%{?dist} -Summary: Inspect Docker images and repositories on registries -License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - -%description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang-github-cpuguy83-go-md2man -BuildRequires: golang(github.com/Azure/go-ansiterm/winterm) -BuildRequires: golang(github.com/Sirupsen/logrus) -BuildRequires: golang(github.com/docker/distribution) -BuildRequires: golang(github.com/docker/distribution/context) -BuildRequires: golang(github.com/docker/distribution/digest) -BuildRequires: golang(github.com/docker/distribution/manifest) -BuildRequires: golang(github.com/docker/distribution/manifest/manifestlist) -BuildRequires: golang(github.com/docker/distribution/manifest/schema1) -BuildRequires: golang(github.com/docker/distribution/manifest/schema2) -BuildRequires: golang(github.com/docker/distribution/reference) -BuildRequires: golang(github.com/docker/distribution/registry/api/errcode) -BuildRequires: golang(github.com/docker/distribution/registry/api/v2) -BuildRequires: golang(github.com/docker/distribution/registry/client) -BuildRequires: golang(github.com/docker/distribution/registry/client/auth) -BuildRequires: golang(github.com/docker/distribution/registry/client/transport) -BuildRequires: golang(github.com/docker/distribution/registry/storage/cache) -BuildRequires: golang(github.com/docker/distribution/registry/storage/cache/memory) -BuildRequires: golang(github.com/docker/distribution/uuid) -BuildRequires: golang(github.com/docker/docker/api) -BuildRequires: golang(github.com/docker/docker/daemon/graphdriver) -BuildRequires: golang(github.com/docker/docker/distribution/metadata) -BuildRequires: golang(github.com/docker/docker/distribution/xfer) -BuildRequires: golang(github.com/docker/docker/dockerversion) -BuildRequires: golang(github.com/docker/docker/image) -BuildRequires: golang(github.com/docker/docker/image/v1) -BuildRequires: golang(github.com/docker/docker/layer) -BuildRequires: golang(github.com/docker/docker/opts) -BuildRequires: golang(github.com/docker/docker/pkg/archive) -BuildRequires: golang(github.com/docker/docker/pkg/chrootarchive) -BuildRequires: golang(github.com/docker/docker/pkg/fileutils) -BuildRequires: golang(github.com/docker/docker/pkg/homedir) -BuildRequires: golang(github.com/docker/docker/pkg/httputils) -BuildRequires: golang(github.com/docker/docker/pkg/idtools) -BuildRequires: golang(github.com/docker/docker/pkg/ioutils) -BuildRequires: golang(github.com/docker/docker/pkg/jsonlog) -BuildRequires: golang(github.com/docker/docker/pkg/jsonmessage) -BuildRequires: golang(github.com/docker/docker/pkg/longpath) -BuildRequires: golang(github.com/docker/docker/pkg/mflag) -BuildRequires: golang(github.com/docker/docker/pkg/parsers/kernel) -BuildRequires: golang(github.com/docker/docker/pkg/plugins) -BuildRequires: golang(github.com/docker/docker/pkg/pools) -BuildRequires: golang(github.com/docker/docker/pkg/progress) -BuildRequires: golang(github.com/docker/docker/pkg/promise) -BuildRequires: golang(github.com/docker/docker/pkg/random) -BuildRequires: golang(github.com/docker/docker/pkg/reexec) -BuildRequires: golang(github.com/docker/docker/pkg/stringid) -BuildRequires: golang(github.com/docker/docker/pkg/system) -BuildRequires: golang(github.com/docker/docker/pkg/tarsum) -BuildRequires: golang(github.com/docker/docker/pkg/term) -BuildRequires: golang(github.com/docker/docker/pkg/term/windows) -BuildRequires: golang(github.com/docker/docker/pkg/useragent) -BuildRequires: golang(github.com/docker/docker/pkg/version) -BuildRequires: golang(github.com/docker/docker/reference) -BuildRequires: golang(github.com/docker/docker/registry) -BuildRequires: golang(github.com/docker/engine-api/types) -BuildRequires: golang(github.com/docker/engine-api/types/blkiodev) -BuildRequires: golang(github.com/docker/engine-api/types/container) -BuildRequires: golang(github.com/docker/engine-api/types/filters) -BuildRequires: golang(github.com/docker/engine-api/types/image) -BuildRequires: golang(github.com/docker/engine-api/types/network) -BuildRequires: golang(github.com/docker/engine-api/types/registry) -BuildRequires: golang(github.com/docker/engine-api/types/strslice) -BuildRequires: golang(github.com/docker/go-connections/nat) -BuildRequires: golang(github.com/docker/go-connections/tlsconfig) -BuildRequires: golang(github.com/docker/go-units) -BuildRequires: golang(github.com/docker/libtrust) -BuildRequires: golang(github.com/gorilla/context) -BuildRequires: golang(github.com/gorilla/mux) -BuildRequires: golang(github.com/opencontainers/runc/libcontainer/user) -BuildRequires: golang(github.com/vbatts/tar-split/archive/tar) -BuildRequires: golang(github.com/vbatts/tar-split/tar/asm) -BuildRequires: golang(github.com/vbatts/tar-split/tar/storage) -BuildRequires: golang(golang.org/x/net/context) -%endif - -%if 0%{?with_bundled} -BuildRequires: golang-github-cpuguy83-go-md2man -%endif - -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif - -%prep -%setup -q -n %{repo}-%{commit} - -%build -mkdir -p src/github.com/runcom -ln -s ../../../ src/github.com/runcom/skopeo - -mkdir -p vendor/src -mv vendor/github.com vendor/src/. -mv vendor/golang.org vendor/src/. - -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -export GOPATH=$(pwd):$(pwd)/vendor:%{gopath} -%endif - -export GO15VENDOREXPERIMENT=1 -%gobuild -o skopeo . - -go-md2man -in man/skopeo.1.md -out skopeo.1 - -%install -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 -make DESTDIR=%{buildroot} install - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -v "./vendor") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test.file-list -for file in $(find . -iname "*_test.go" | grep -v "./vendor"); do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} -%endif - -%gotest %{import_path}/integration -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md -%endif - -%files -%{_bindir}/skopeo -%{_mandir}/man1/skopeo.1* -%doc README.md LICENSE - -%changelog -* Thu Jan 28 2016 Antonio Murdaca - 0.1.3-0.1.gitfdb5cac -- First package for Fedora