3 Commits

Author SHA1 Message Date
Anthony Oteri 5e7d0e4e1e Release version 1.1.0 2023-10-03 09:55:09 -04:00
Anthony Oteri 600c2d86ac Merge pull request #52 from anthonyoteri/license
Change License to MIT/Apache
2023-10-03 09:48:38 -04:00
Anthony Oteri 0e4219b405 Change License
This changes the effective license from a simple Apache-2.0 license to a
dual license consisting of both Apache-2.0 and the MIT license to be more
compatible for use in GPL Code.

The MIT license requires reproducing countless copies of the same copyright
header with diffferent names in the copyright field, for every MIT library
in use.  The Apache license does not have this drawback.  However, this is not
the primary motivation for creating these issues.  The Apache license also has
protections from patent trolls and explicit contribuition licensing clause.
However the Apache license is incompatible with GPLv2.  This is why Rust is
dual-licensed as MIT/Apache (the "primary" license being Apache, MIT only for
GPLv2 compat), and doing so would be wise for this project.  This also makes
this crate suitable for inclusion and unrestricted sharing in the Rust
standard distribution and other projects using dual MIT/Apache.
2023-10-03 09:36:43 -04:00
17 changed files with 117 additions and 106 deletions
+6
View File
@@ -0,0 +1,6 @@
<component name="CopyrightManager">
<copyright>
<option name="notice" value="Copyright 2023 Anthony Oteri&#10;&#10;Licensed under the Apache License, Version 2.0, &lt;LICENSE-APACHE or&#10;http://apache.org/licenses/LICENSE-2.0&gt; or the MIT license &lt;LICENSE-MIT or&#10;http://opensource.org/licenses/MIT&gt;, at your option. This file may not be&#10;copied, modified, or distributed except according to those terms." />
<option name="myName" value="MIT OR Apache-2.0 (personal)" />
</copyright>
</component>
+1 -1
View File
@@ -1,7 +1,7 @@
<component name="CopyrightManager"> <component name="CopyrightManager">
<settings> <settings>
<module2copyright> <module2copyright>
<element module="Project Files" copyright="Apache License (personal)" /> <element module="Project Files" copyright="MIT OR Apache-2.0 (personal)" />
</module2copyright> </module2copyright>
</settings> </settings>
</component> </component>
+2 -2
View File
@@ -1,13 +1,13 @@
[package] [package]
name = "dredge-tool" name = "dredge-tool"
version = "1.0.0" version = "1.1.0"
edition = "2021" edition = "2021"
authors = ["Anthony Oteri"] authors = ["Anthony Oteri"]
description = "A Command Line tool for interracting with the Docker Registry API" description = "A Command Line tool for interracting with the Docker Registry API"
readme = "README.md" readme = "README.md"
repository = "https://github.com/anthonyoteri/dredge" repository = "https://github.com/anthonyoteri/dredge"
rust-version = "1.72" rust-version = "1.72"
license-file = "LICENSE" license = "MIT OR Apache-2.0"
keywords = [ keywords = [
"docker", "docker",
"registry", "registry",
View File
+24
View File
@@ -0,0 +1,24 @@
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:
The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.
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.
+16
View File
@@ -107,3 +107,19 @@ Arguments:
Options: Options:
-h, --help Print help -h, --help Print help
``` ```
## License
Licensed under either of
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
at your option.
### Contribution
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
additional terms or conditions.
+9
View File
@@ -1,11 +1,20 @@
# Dredge Release Notes # Dredge Release Notes
## Legal
As of version 1.1.0, this software license has been changed from Apache-2.0
to a dual-licensed Apache-2.0 OR MIT license.
## Known Issues ## Known Issues
* Docker authentication is not currently supported, and attempts to query a * Docker authentication is not currently supported, and attempts to query a
registry which requires authentication will fail. registry which requires authentication will fail.
## Changelog ## Changelog
- v1.1.0
- Change License by Anthony Oteri 0e4219b
- v1.0.0 - v1.0.0
- Rename project to dredge-tool by Anthony Oteri b60d433 - Rename project to dredge-tool by Anthony Oteri b60d433
+3
View File
@@ -0,0 +1,3 @@
- v1.1.0
- Change License by Anthony Oteri 0e4219b
+5
View File
@@ -1,5 +1,10 @@
# Dredge Release Notes # Dredge Release Notes
## Legal
As of version 1.1.0, this software license has been changed from Apache-2.0
to a dual-licensed Apache-2.0 OR MIT license.
## Known Issues ## Known Issues
* Docker authentication is not currently supported, and attempts to query a * Docker authentication is not currently supported, and attempts to query a
+9 -16
View File
@@ -1,21 +1,14 @@
#
# Copyright 2023 Anthony Oteri
#
# 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.
#
#!/usr/bin/bash #!/usr/bin/bash
#
# Copyright 2023 Anthony Oteri
#
# Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
# http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
# http://opensource.org/licenses/MIT>, at your option. This file may not be
# copied, modified, or distributed except according to those terms.
#
set -e set -e
REPO_ROOT=$(git rev-parse --show-toplevel) REPO_ROOT=$(git rev-parse --show-toplevel)
+8 -13
View File
@@ -1,20 +1,15 @@
#!/usr/bin/bash
# #
# Copyright 2023 Anthony Oteri # Copyright 2023 Anthony Oteri
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
# you may not use this file except in compliance with the License. # http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
# You may obtain a copy of the License at # http://opensource.org/licenses/MIT>, at your option. This file may not be
# # copied, modified, or distributed except according to those terms.
# 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/bash -e set -e
version=$1 version=$1
previous=$2 previous=$2
+8 -13
View File
@@ -1,20 +1,15 @@
#!/usr/bin/bash
# #
# Copyright 2023 Anthony Oteri # Copyright 2023 Anthony Oteri
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
# you may not use this file except in compliance with the License. # http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
# You may obtain a copy of the License at # http://opensource.org/licenses/MIT>, at your option. This file may not be
# # copied, modified, or distributed except according to those terms.
# 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/bash set -e
REPO_ROOT=$(git rev-parse --show-toplevel) REPO_ROOT=$(git rev-parse --show-toplevel)
+5 -12
View File
@@ -1,17 +1,10 @@
/* /*
* Copyright 2023 Anthony Oteri * Copyright 2023 Anthony Oteri
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* you may not use this file except in compliance with the License. * http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* You may obtain a copy of the License at * http://opensource.org/licenses/MIT>, at your option. This file may not be
* * copied, modified, or distributed except according to those terms.
* 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.
*/ */
use http::header; use http::header;
+5 -12
View File
@@ -1,17 +1,10 @@
/* /*
* Copyright 2023 Anthony Oteri * Copyright 2023 Anthony Oteri
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* you may not use this file except in compliance with the License. * http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* You may obtain a copy of the License at * http://opensource.org/licenses/MIT>, at your option. This file may not be
* * copied, modified, or distributed except according to those terms.
* 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.
*/ */
#![allow(unused_imports)] #![allow(unused_imports)]
+5 -12
View File
@@ -1,17 +1,10 @@
/* /*
* Copyright 2023 Anthony Oteri * Copyright 2023 Anthony Oteri
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* you may not use this file except in compliance with the License. * http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* You may obtain a copy of the License at * http://opensource.org/licenses/MIT>, at your option. This file may not be
* * copied, modified, or distributed except according to those terms.
* 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.
*/ */
use std::io::Write; use std::io::Write;
+5 -12
View File
@@ -1,17 +1,10 @@
/* /*
* Copyright 2023 Anthony Oteri * Copyright 2023 Anthony Oteri
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* you may not use this file except in compliance with the License. * http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* You may obtain a copy of the License at * http://opensource.org/licenses/MIT>, at your option. This file may not be
* * copied, modified, or distributed except according to those terms.
* 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.
*/ */
#![allow(clippy::enum_variant_names)] #![allow(clippy::enum_variant_names)]
+5 -12
View File
@@ -1,17 +1,10 @@
/* /*
* Copyright 2023 Anthony Oteri * Copyright 2023 Anthony Oteri
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* you may not use this file except in compliance with the License. * http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* You may obtain a copy of the License at * http://opensource.org/licenses/MIT>, at your option. This file may not be
* * copied, modified, or distributed except according to those terms.
* 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.
*/ */
#![deny(clippy::pedantic)] #![deny(clippy::pedantic)]