diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bc1d356..f34a9a2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + version: 2 updates: - package-ecosystem: "github-actions" diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 38c4131..d00aaae 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + name: "Build container: nginx" env: diff --git a/.github/workflows/php-fpm-ttrss.yml b/.github/workflows/php-fpm-ttrss.yml index 2304be7..efaef24 100644 --- a/.github/workflows/php-fpm-ttrss.yml +++ b/.github/workflows/php-fpm-ttrss.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + name: "Build container: php-fpm-ttrss" env: @@ -85,7 +88,8 @@ jobs: - name: "Sign container image" if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' run: | - cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ env.REGISTRY }}/${{ env.NAME }}@${{ steps.push.outputs.digest }} + cosign sign -y --key env://COSIGN_PRIVATE_KEY "${{ env.REGISTRY }}/${{ env.NAME }}@${DIGEST}" env: COSIGN_EXPERIMENTAL: false COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} + DIGEST: ${{ steps.push.outputs.digest }} diff --git a/.github/workflows/reuse-lint.yml b/.github/workflows/reuse-lint.yml new file mode 100644 index 0000000..5afd743 --- /dev/null +++ b/.github/workflows/reuse-lint.yml @@ -0,0 +1,21 @@ +# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. +# SPDX-License-Identifier: CC0-1.0 +--- +name: REUSE Compliance Check + +on: [push, pull_request] + +permissions: + contents: read + +jobs: + reuse-compliance-check: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + persist-credentials: false + + - name: REUSE Compliance Check + uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6 diff --git a/.github/workflows/toolbox-cloud-cli.yml b/.github/workflows/toolbox-cloud-cli.yml index 771d5b9..bc39422 100644 --- a/.github/workflows/toolbox-cloud-cli.yml +++ b/.github/workflows/toolbox-cloud-cli.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + name: "Build container: toolbox-cloud-cli" env: diff --git a/.github/workflows/toolbox-kdedev.yml b/.github/workflows/toolbox-kdedev.yml index 93497e5..96cfa65 100644 --- a/.github/workflows/toolbox-kdedev.yml +++ b/.github/workflows/toolbox-kdedev.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + name: "Build container: toolbox-kdedev" env: diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml index c14df05..131f1a4 100644 --- a/.github/workflows/toolbox.yml +++ b/.github/workflows/toolbox.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + name: "Build container: toolbox" env: diff --git a/.github/workflows/unbound.yml b/.github/workflows/unbound.yml index 56a7abf..c2907e1 100644 --- a/.github/workflows/unbound.yml +++ b/.github/workflows/unbound.yml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + name: "Build container: unbound" env: diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml new file mode 100644 index 0000000..e2758d0 --- /dev/null +++ b/.github/workflows/zizmor.yml @@ -0,0 +1,27 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: CC0-1.0 + +name: "GitHub Actions Security Analysis with zizmor 🌈" + +on: + push: + branches: ["main"] + pull_request: + branches: ["**"] + +permissions: {} + +jobs: + zizmor: + name: "Run zizmor 🌈" + runs-on: "ubuntu-latest" + permissions: + security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files. + steps: + - name: "Checkout repository" + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + persist-credentials: false + + - name: "Run zizmor 🌈" + uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6 diff --git a/.gitignore b/.gitignore index 01228a3..b8521e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + /cache.libdnf5/ /out.ociarchive diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7f8f94e..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -MIT License - -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 (including the next -paragraph) 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. diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 0000000..d817195 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,18 @@ +MIT License + +Copyright (c) + +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. diff --git a/README.md b/README.md index ac91208..74a3d02 100644 --- a/README.md +++ b/README.md @@ -85,4 +85,4 @@ $ cat /etc/containers/policy.json ## License -See [LICENSE](LICENSE) or [CC0](https://creativecommons.org/public-domain/cc0/). +See [LICENSES](LICENSES). diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..9f49387 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,12 @@ +version = 1 + +[[annotations]] +path = [ + "README.md", + "*/README.md", + "quay.io-travier-containers.pub", +] +SPDX-FileCopyrightText = [ + "Timothée Ravier " +] +SPDX-License-Identifier = "CC0-1.0" diff --git a/justfile b/justfile index 86d98ac..03d7d8a 100644 --- a/justfile +++ b/justfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + podman_build_opts := "--skip-unused-stages=false --security-opt=label=disable" all: diff --git a/nginx/Containerfile b/nginx/Containerfile index e21ba6b..7532143 100644 --- a/nginx/Containerfile +++ b/nginx/Containerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + FROM registry.fedoraproject.org/fedora-minimal:44 as builder ARG DNF_KEEP_CACHE=false diff --git a/php-fpm-ttrss/Containerfile b/php-fpm-ttrss/Containerfile index 8cad477..a65c1b6 100644 --- a/php-fpm-ttrss/Containerfile +++ b/php-fpm-ttrss/Containerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + FROM registry.fedoraproject.org/fedora-minimal:43 # Install php and required modules, remove unneeded packages and remove all SUID/SGID binaries diff --git a/toolbox-cloud-cli/Containerfile b/toolbox-cloud-cli/Containerfile index 5a3a601..a30df73 100644 --- a/toolbox-cloud-cli/Containerfile +++ b/toolbox-cloud-cli/Containerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + FROM registry.fedoraproject.org/fedora-toolbox:44 as builder # - Install common tools diff --git a/toolbox-kdedev/Containerfile b/toolbox-kdedev/Containerfile index cdde80f..f39c941 100644 --- a/toolbox-kdedev/Containerfile +++ b/toolbox-kdedev/Containerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + FROM registry.fedoraproject.org/fedora-toolbox:44 as builder # - Install common development tools diff --git a/toolbox-kdedev/host-runner b/toolbox-kdedev/host-runner deleted file mode 100755 index 0959e18..0000000 --- a/toolbox-kdedev/host-runner +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -executable="$(basename ${0})" -# set -x -exec flatpak-spawn --host "${executable}" "${@}" diff --git a/toolbox/Containerfile b/toolbox/Containerfile index 36941c0..9470dba 100644 --- a/toolbox/Containerfile +++ b/toolbox/Containerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + FROM registry.fedoraproject.org/fedora-toolbox:44 as builder # - Install common development tools diff --git a/unbound/Containerfile b/unbound/Containerfile index be64e11..1707006 100644 --- a/unbound/Containerfile +++ b/unbound/Containerfile @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: Timothée Ravier +# SPDX-License-Identifier: MIT OR CC0-1.0 + FROM registry.fedoraproject.org/fedora-minimal:44 as builder ARG DNF_KEEP_CACHE=false