Skip to content

Commit ccdfeca

Browse files
authored
Merge pull request #40 from docker/migrate
chore: migrate to docker org
2 parents 635d07c + 07f0e60 commit ccdfeca

12 files changed

+161
-86
lines changed

.github/CODEOWNERS

-1
This file was deleted.

.github/CODE_OF_CONDUCT.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Code of conduct
2+
3+
- [Moby community guidelines](https://github.com/moby/moby/blob/master/CONTRIBUTING.md#moby-community-guidelines)

.github/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ to the public under the [project's open source license](LICENSE).
77

88
## Submitting a pull request
99

10-
1. [Fork](https://github.com/crazy-max/ghaction-setup-docker/fork) and clone the repository
10+
1. [Fork](https://github.com/docker/setup-docker-action/fork) and clone the repository
1111
2. Configure and install the dependencies: `yarn install`
1212
3. Create a new branch: `git checkout -b my-branch-name`
1313
4. Make your changes
1414
5. Format code and build javascript artifacts: `docker buildx bake pre-checkin`
1515
6. Validate all code has correctly formatted and built: `docker buildx bake validate`
16-
7. Push to your fork and [submit a pull request](https://github.com/crazy-max/ghaction-setup-docker/compare)
16+
7. Push to your fork and [submit a pull request](https://github.com/docker/setup-docker-action/compare)
1717
8. Pat your self on the back and wait for your pull request to be reviewed and merged.
1818

1919
Here are a few things you can do that will increase the likelihood of your pull request being accepted:

.github/ISSUE_TEMPLATE/bug.yml

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
2+
name: Bug Report
3+
description: Report a bug
4+
labels:
5+
- status/triage
6+
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Thank you for taking the time to report a bug!
12+
If this is a security issue please report it to the [Docker Security team](mailto:[email protected]).
13+
Before submitting a bug report, check out the [Troubleshooting doc](https://github.com/docker/setup-docker-action/blob/master/TROUBLESHOOTING.md).
14+
15+
- type: checkboxes
16+
attributes:
17+
label: Contributing guidelines
18+
description: >
19+
Make sure you've read the contributing guidelines before proceeding.
20+
options:
21+
- label: I've read the [contributing guidelines](https://github.com/docker/setup-docker-action/blob/master/.github/CONTRIBUTING.md) and wholeheartedly agree
22+
required: true
23+
24+
- type: checkboxes
25+
attributes:
26+
label: "I've found a bug, and:"
27+
description: |
28+
Make sure that your request fulfills all of the following requirements.
29+
If one requirement cannot be satisfied, explain in detail why.
30+
options:
31+
- label: The documentation does not mention anything about my problem
32+
- label: There are no open or closed issues that are related to my problem
33+
34+
- type: textarea
35+
attributes:
36+
label: Description
37+
description: >
38+
Provide a brief description of the bug in 1-2 sentences.
39+
validations:
40+
required: true
41+
42+
- type: textarea
43+
attributes:
44+
label: Expected behaviour
45+
description: >
46+
Describe precisely what you'd expect to happen.
47+
validations:
48+
required: true
49+
50+
- type: textarea
51+
attributes:
52+
label: Actual behaviour
53+
description: >
54+
Describe precisely what is actually happening.
55+
validations:
56+
required: true
57+
58+
- type: input
59+
attributes:
60+
label: Repository URL
61+
description: >
62+
Enter the URL of the repository where you are experiencing the
63+
issue. If your repository is private, provide a link to a minimal
64+
repository that reproduces the issue.
65+
66+
- type: input
67+
attributes:
68+
label: Workflow run URL
69+
description: >
70+
Enter the URL of the GitHub Action workflow run if public (e.g.
71+
`https://github.com/<user>/<repo>/actions/runs/<id>`)
72+
73+
- type: textarea
74+
attributes:
75+
label: YAML workflow
76+
description: |
77+
Provide the YAML of the workflow that's causing the issue.
78+
Make sure to remove any sensitive information.
79+
render: yaml
80+
validations:
81+
required: true
82+
83+
- type: textarea
84+
attributes:
85+
label: Workflow logs
86+
description: >
87+
[Attach](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files)
88+
the [log file of your workflow run](https://docs.github.com/en/actions/managing-workflow-runs/using-workflow-run-logs#downloading-logs)
89+
and make sure to remove any sensitive information.
90+
91+
- type: textarea
92+
attributes:
93+
label: Docker daemon logs
94+
description: >
95+
If applicable, provide the Docker logs available in post step.
96+
render: text
97+
98+
- type: textarea
99+
attributes:
100+
label: Additional info
101+
description: |
102+
Provide any additional information that could be useful.

.github/ISSUE_TEMPLATE/bug_report.md

-34
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
2+
blank_issues_enabled: true
3+
contact_links:
4+
- name: Questions and Discussions
5+
url: https://github.com/docker/setup-docker-action/discussions/new
6+
about: Use Github Discussions to ask questions and/or open discussion topics.

.github/ISSUE_TEMPLATE/feature.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
2+
name: Feature request
3+
description: Missing functionality? Come tell us about it!
4+
labels:
5+
- kind/enhancement
6+
- status/triage
7+
8+
body:
9+
- type: textarea
10+
id: description
11+
attributes:
12+
label: Description
13+
description: What is the feature you want to see?
14+
validations:
15+
required: true

.github/SECURITY.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Reporting security issues
2+
3+
The project maintainers take security seriously. If you discover a security
4+
issue, please bring it to their attention right away!
5+
6+
**Please _DO NOT_ file a public issue**, instead send your report privately to
7+
8+
9+
Security reports are greatly appreciated, and we will publicly thank you for it.
10+
We also like to send gifts&mdash;if you'd like Docker swag, make sure to let
11+
us know. We currently do not offer a paid security bounty program, but are not
12+
ruling it out in the future.

.github/SUPPORT.md

-31
This file was deleted.

README.md

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1-
[![GitHub release](https://img.shields.io/github/release/crazy-max/ghaction-setup-docker.svg?style=flat-square)](https://github.com/crazy-max/ghaction-setup-docker/releases/latest)
1+
[![GitHub release](https://img.shields.io/github/release/docker/setup-docker-action.svg?style=flat-square)](https://github.com/docker/setup-docker-action/releases/latest)
22
[![GitHub marketplace](https://img.shields.io/badge/marketplace-docker--setup--docker-blue?logo=github&style=flat-square)](https://github.com/marketplace/actions/docker-setup-docker)
3-
[![CI workflow](https://img.shields.io/github/actions/workflow/status/crazy-max/ghaction-setup-docker/ci.yml?branch=master&label=ci&logo=github&style=flat-square)](https://github.com/crazy-max/ghaction-setup-docker/actions?workflow=ci)
4-
[![Test workflow](https://img.shields.io/github/actions/workflow/status/crazy-max/ghaction-setup-docker/test.yml?branch=master&label=test&logo=github&style=flat-square)](https://github.com/crazy-max/ghaction-setup-docker/actions?workflow=test)
5-
[![Codecov](https://img.shields.io/codecov/c/github/crazy-max/ghaction-setup-docker?logo=codecov&style=flat-square)](https://codecov.io/gh/crazy-max/ghaction-setup-docker)
3+
[![CI workflow](https://img.shields.io/github/actions/workflow/status/docker/setup-docker-action/ci.yml?branch=master&label=ci&logo=github&style=flat-square)](https://github.com/docker/setup-docker-action/actions?workflow=ci)
4+
[![Test workflow](https://img.shields.io/github/actions/workflow/status/docker/setup-docker-action/test.yml?branch=master&label=test&logo=github&style=flat-square)](https://github.com/docker/setup-docker-action/actions?workflow=test)
5+
[![Codecov](https://img.shields.io/codecov/c/github/docker/setup-docker-action?logo=codecov&style=flat-square)](https://codecov.io/gh/docker/setup-docker-action)
66

77
## About
88

99
GitHub Action to set up (download and install) [Docker CE](https://docs.docker.com/engine/).
1010
Works on Linux, macOS and Windows.
1111

12+
> [!NOTE]
13+
> This action is useful if you want to pin against a specific Docker version or
14+
> set up a custom daemon configuration or if Docker is not available on your
15+
> runner. If you're using [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources)
16+
> on Linux or Windows, Docker is already up and running, so it might not be
17+
> necessary to use this action.
18+
1219
> [!WARNING]
1320
> Does not work on macOS runners with ARM architecture (no nested virtualization):
1421
> * https://github.com/crazy-max/ghaction-setup-docker/pull/53
@@ -44,7 +51,7 @@ jobs:
4451
steps:
4552
-
4653
name: Set up Docker
47-
uses: crazy-max/ghaction-setup-docker@v3
54+
uses: docker/setup-docker-action@v3
4855
```
4956
5057
### Daemon configuration
@@ -66,7 +73,7 @@ jobs:
6673
steps:
6774
-
6875
name: Set up Docker
69-
uses: crazy-max/ghaction-setup-docker@v3
76+
uses: docker/setup-docker-action@v3
7077
with:
7178
daemon-config: |
7279
{
@@ -94,7 +101,7 @@ jobs:
94101
steps:
95102
-
96103
name: Set up Docker
97-
uses: crazy-max/ghaction-setup-docker@v3
104+
uses: docker/setup-docker-action@v3
98105
env:
99106
LIMA_START_ARGS: --cpus 4 --memory 8
100107
```
@@ -124,12 +131,8 @@ The following outputs are available
124131

125132
## Contributing
126133

127-
Want to contribute? Awesome! The most basic way to show your support is to star
128-
the project, or to raise issues. You can also support this project by [**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max)
129-
or by making a [PayPal donation](https://www.paypal.me/crazyws) to ensure this
130-
journey continues indefinitely!
131-
132-
Thanks again for your support, it is much appreciated! :pray:
134+
Want to contribute? Awesome! You can find information about contributing to
135+
this project in the [CONTRIBUTING.md](/.github/CONTRIBUTING.md)
133136

134137
## License
135138

action.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://help.github.com/en/articles/metadata-syntax-for-github-actions
2-
name: 'Docker Setup Docker'
3-
description: 'Set up Docker for use in GitHub Actions by downloading and installing a version of Docker CE'
4-
author: 'crazy-max'
2+
name: Docker Setup Docker
3+
description: Set up Docker for use in GitHub Actions by downloading and installing a version of Docker CE
4+
author: docker
55
branding:
66
icon: 'anchor'
77
color: 'blue'

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
},
1616
"repository": {
1717
"type": "git",
18-
"url": "git+https://github.com/crazy-max/ghaction-setup-docker.git"
18+
"url": "git+https://github.com/docker/setup-docker-action.git"
1919
},
2020
"keywords": [
2121
"actions",
2222
"docker",
2323
"engine"
2424
],
25-
"author": "CrazyMax",
25+
"author": "Docker Inc.",
2626
"license": "Apache-2.0",
2727
"packageManager": "[email protected]",
2828
"dependencies": {

0 commit comments

Comments
 (0)