From d50edfe97706f861df299d4fd42230050d37e00e Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 21 Aug 2020 16:48:16 +0200 Subject: [PATCH] Migrate to Docker organization --- .github/CONTRIBUTING.md | 4 +- .github/FUNDING.yml | 2 - .github/ISSUE_TEMPLATE/bug_report.md | 4 +- .github/SUPPORT.md | 8 +- ...tion-docker-login.png => docker-login.png} | Bin .github/workflows/labels.yml | 6 +- LICENSE | 204 ++++++++++++++++-- README.md | 44 ++-- action.yml | 4 +- package.json | 10 +- 10 files changed, 220 insertions(+), 66 deletions(-) delete mode 100644 .github/FUNDING.yml rename .github/{ghaction-docker-login.png => docker-login.png} (100%) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index becc1f5..4a0ca74 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,12 +6,12 @@ Contributions to this project are [released](https://help.github.com/articles/gi ## Submitting a pull request -1. [Fork](https://github.com/crazy-max/ghaction-docker-login/fork) and clone the repository +1. [Fork](https://github.com/docker/login-action/fork) and clone the repository 2. Configure and install the dependencies: `yarn install` 4. Create a new branch: `git checkout -b my-branch-name` 5. Make your change 6. Run pre-checkin: `yarn run pre-checkin` -7. Push to your fork and [submit a pull request](https://github.com/crazy-max/ghaction-docker-login/compare) +7. Push to your fork and [submit a pull request](https://github.com/docker/login-action/compare) 8. Pat your self on the back and wait for your pull request to be reviewed and merged. Here are a few things you can do that will increase the likelihood of your pull request being accepted: diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 04c13b5..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: crazy-max -custom: https://www.paypal.me/crazyws diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f7ca2d7..1c2136d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -13,11 +13,11 @@ about: Create a report to help us improve #### Expected behaviour -> Tell me what should happen +> Tell us what should happen #### Actual behaviour -> Tell me what happens instead +> Tell us what happens instead ### Configuration diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md index a4468ed..1f563cc 100644 --- a/.github/SUPPORT.md +++ b/.github/SUPPORT.md @@ -1,8 +1,8 @@ -# Support [![](https://isitmaintained.com/badge/resolution/crazy-max/ghaction-docker-login.svg)](https://isitmaintained.com/project/crazy-max/ghaction-docker-login) +# Support [![](https://isitmaintained.com/badge/resolution/docker/login-action.svg)](https://isitmaintained.com/project/docker/login-action) ## Reporting an issue -Please do a search in [open issues](https://github.com/crazy-max/ghaction-docker-login/issues?utf8=%E2%9C%93&q=) to see if the issue or feature request has already been filed. +Please do a search in [open issues](https://github.com/docker/login-action/issues?utf8=%E2%9C%93&q=) to see if the issue or feature request has already been filed. If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment. @@ -21,9 +21,9 @@ File a single issue per problem and feature request. The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix. -You are now ready to [create a new issue](https://github.com/crazy-max/ghaction-docker-login/issues/new/choose)! +You are now ready to [create a new issue](https://github.com/docker/login-action/issues/new/choose)! ## Closure policy * Issues that don't have the information requested above (when applicable) will be closed immediately and the poster directed to the support guidelines. -* Issues that go a week without a response from original poster are subject to closure at my discretion. +* Issues that go a week without a response from original poster are subject to closure at our discretion. diff --git a/.github/ghaction-docker-login.png b/.github/docker-login.png similarity index 100% rename from .github/ghaction-docker-login.png rename to .github/docker-login.png diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 0c7a0ce..68650d1 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -18,6 +18,6 @@ jobs: - name: Run Labeler if: success() - uses: crazy-max/ghaction-github-labeler@v2.1.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: crazy-max/ghaction-github-labeler@v3.0.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/LICENSE b/LICENSE index 02f595c..6d8d58f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,191 @@ -MIT License -Copyright (c) 2020 CrazyMax + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ -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: + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + 1. Definitions. -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. + "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-2018 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/README.md b/README.md index 813b68c..88be1ac 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,14 @@ -[![GitHub release](https://img.shields.io/github/release/crazy-max/ghaction-docker-login.svg?style=flat-square)](https://github.com/crazy-max/ghaction-docker-login/releases/latest) +[![GitHub release](https://img.shields.io/github/release/docker/login-action.svg?style=flat-square)](https://github.com/docker/login-action/releases/latest) [![GitHub marketplace](https://img.shields.io/badge/marketplace-docker--login-blue?logo=github&style=flat-square)](https://github.com/marketplace/actions/docker-login) -[![CI workflow](https://img.shields.io/github/workflow/status/crazy-max/ghaction-docker-login/test?label=ci&logo=github&style=flat-square)](https://github.com/crazy-max/ghaction-docker-login/actions?workflow=ci) -[![Test workflow](https://img.shields.io/github/workflow/status/crazy-max/ghaction-docker-login/test?label=test&logo=github&style=flat-square)](https://github.com/crazy-max/ghaction-docker-login/actions?workflow=test) -[![Codecov](https://img.shields.io/codecov/c/github/crazy-max/ghaction-docker-login?logo=codecov&style=flat-square)](https://codecov.io/gh/crazy-max/ghaction-docker-login) - -[![Become a sponsor](https://img.shields.io/badge/sponsor-crazy--max-181717.svg?logo=github&style=flat-square)](https://github.com/sponsors/crazy-max) -[![Paypal Donate](https://img.shields.io/badge/donate-paypal-00457c.svg?logo=paypal&style=flat-square)](https://www.paypal.me/crazyws) +[![CI workflow](https://img.shields.io/github/workflow/status/docker/login-action/test?label=ci&logo=github&style=flat-square)](https://github.com/docker/login-action/actions?workflow=ci) +[![Test workflow](https://img.shields.io/github/workflow/status/docker/login-action/test?label=test&logo=github&style=flat-square)](https://github.com/docker/login-action/actions?workflow=test) +[![Codecov](https://img.shields.io/codecov/c/github/docker/login-action?logo=codecov&style=flat-square)](https://codecov.io/gh/docker/login-action) ## About -GitHub Action to login against a Docker registry +GitHub Action to login against a Docker registry. -If you are interested, [check out](https://git.io/Je09Y) my other :octocat: GitHub Actions! - -![GitHub Pages](.github/ghaction-docker-login.png) +![Screenshot](.github/docker-login.png) ___ @@ -28,8 +23,6 @@ ___ * [inputs](#inputs) * [Keep up-to-date with GitHub Dependabot](#keep-up-to-date-with-github-dependabot) * [Limitation](#limitation) -* [How can I help?](#how-can-i-help) -* [License](#license) ## Usage @@ -51,7 +44,7 @@ jobs: uses: actions/checkout@v2 - name: Login to DockerHub - uses: crazy-max/ghaction-docker-login@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} @@ -75,7 +68,7 @@ jobs: uses: actions/checkout@v2 - name: Login to GitHub Package Registry - uses: crazy-max/ghaction-docker-login@v1 + uses: docker/login-action@v1 with: registry: docker.pkg.github.com username: ${{ github.repository_owner }} @@ -100,7 +93,7 @@ jobs: uses: actions/checkout@v2 - name: Login to GitLab - uses: crazy-max/ghaction-docker-login@v1 + uses: docker/login-action@v1 with: registry: registry.gitlab.com username: ${{ secrets.GITLAB_USERNAME }} @@ -129,7 +122,7 @@ jobs: uses: actions/checkout@v2 - name: Login to ACR - uses: crazy-max/ghaction-docker-login@v1 + uses: docker/login-action@v1 with: registry: .azurecr.io username: ${{ secrets.AZURE_CLIENT_ID }} @@ -161,7 +154,7 @@ jobs: uses: actions/checkout@v2 - name: Login to GCR - uses: crazy-max/ghaction-docker-login@v1 + uses: docker/login-action@v1 with: registry: gcr.io username: _json_key @@ -190,7 +183,7 @@ jobs: uses: actions/checkout@v2 - name: Login to ECR - uses: crazy-max/ghaction-docker-login@v1 + uses: docker/login-action@v1 with: registry: .dkr.ecr..amazonaws.com username: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -231,16 +224,3 @@ updates: ## Limitation This action is only available for Linux [virtual environments](https://help.github.com/en/articles/virtual-environments-for-github-actions#supported-virtual-environments-and-hardware-resources). - -## How can I help? - -All kinds of contributions are welcome :raised_hands:! The most basic way to show your support is to star :star2: -the project, or to raise issues :speech_balloon: You can also support this project by -[**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max) :clap: or by making a -[Paypal donation](https://www.paypal.me/crazyws) to ensure this journey continues indefinitely! :rocket: - -Thanks again for your support, it is much appreciated! :pray: - -## License - -MIT. See `LICENSE` for more details. diff --git a/action.yml b/action.yml index 9c752f9..07c82e8 100644 --- a/action.yml +++ b/action.yml @@ -1,9 +1,9 @@ # https://help.github.com/en/articles/metadata-syntax-for-github-actions name: 'Docker Login' description: 'GitHub Action to login against a Docker registry' -author: 'crazy-max' +author: 'docker' branding: - icon: 'log-in' + icon: 'anchor' color: 'blue' inputs: diff --git a/package.json b/package.json index 5fb8353..8558a1d 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,20 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/crazy-max/ghaction-docker-login.git" + "url": "git+https://github.com/docker/login-action.git" }, "keywords": [ "actions", "docker", "login" ], - "author": "CrazyMax", + "author": "Docker", + "contributors": [ + { + "name": "CrazyMax", + "url": "https://crazymax.dev" + } + ], "license": "MIT", "dependencies": { "@actions/core": "^1.2.4",