-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Import man pages #68
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Import man pages #68
Changes from all commits
1afd87e
4aa3cb7
ca0d410
7c854f4
716f360
b86510e
422798e
3049e51
79c8a65
4b28c05
33c90c2
8dbba9e
bd7f6fc
efe1db8
26b01ec
3bb809d
18b8b86
c01cdd7
5c1eff2
f8f3546
ea42c4e
ae918a1
17172c9
a567eae
d15652c
b3f4a8e
9e09a07
a678fd4
439645f
4eabc1b
ea40c96
4724a7e
75f109f
fcb77b2
e13d00e
6dc30c4
3327539
45621c2
230d30a
28d962a
8a1e318
fefcd37
b4e1d2c
4a012e2
1573044
f213a46
c5bf50c
f9d68cf
6ac2ae5
55b4cf9
c75e013
d99e57f
7ae694c
7fbcc7b
30095dc
e78c505
88fd865
bad2396
039e36f
077efc4
120f2e4
606e1ec
771c525
2aac639
7cfb9b5
6d90b55
0463ed0
abbe7f8
1ee546f
654c430
9c19344
34b5428
a76eba6
c07971f
2c6040a
48596d9
462a98e
ef1888b
d9d4586
26d54d5
01cd7b9
1ec2501
ced1317
76c1230
fede72a
8b50845
b819438
9aab0b2
3de2c3b
cefba85
725ca01
fafb6ca
9e57d0d
205176d
1b3ad56
c66cc89
317f617
7283b47
3eab4d9
3f3e6d8
0c87fce
57edd01
119016c
7a4bfc2
f2bf4ae
da31efc
b1dbdf3
41ee433
61ede6f
8faf9a1
3ecf417
cf6e723
7d5bd20
5decb80
f8c9ece
3a2c459
82b607a
b6cf3e7
14abd38
c4b439f
babb917
515d548
08e8de4
c8ff32d
d87ef58
4abcc4b
7d85c86
e796ed3
17e2a3e
bb3ea66
c95ed91
0f979bb
3c768c6
acc122d
1864e3e
ef9a851
e35e2a0
e12713a
ded9ce4
f2f37ff
dddf62f
83ff336
2e14234
4d8e306
9b3749d
82b73af
be11f1b
d005d05
f19f6ac
5e388d1
ef1746e
809276c
c2646f9
500fb3f
c6116f1
deddca7
29b5ad4
1732bd2
7f19f46
1f04714
9287e93
c65e497
a32e0a5
0321bd0
564e99b
c14f1cb
18191c3
84d4bcf
0583787
5386414
6a0a021
d22d8cc
b9e0c7e
baf4c90
11ce68f
1435706
11f3f4b
7e58974
422eb19
6fd8efb
7eaabbf
a4840c0
ac2014c
6220ef0
a5f3022
2154052
8deaff1
91f4072
86aab64
720e21d
6199f76
f2afbb4
c1d8219
37ce4df
f021af3
ae04459
c5c4243
d0db94e
d61f48b
b334e25
06a586d
fbda88d
ce6a8bf
70c8043
ab52ea0
3d7ab79
c286340
ff95df5
8c291d9
06c53be
61e7109
9885852
27ce16e
6244e31
3a9c28b
70b72d0
01cc7a8
3f8e7f6
e9cb014
fb1816e
c568032
a376ca2
a4f91c3
7e92b54
b349155
336c8a6
3d8721a
24df13a
f9e9540
5c383f8
3dbc56b
9886074
3289e52
8a1dd98
759a39e
5cafdb8
a6eeec3
464c687
c24f769
fbed3e2
e2752b0
fc4ad8c
986fc33
d5a19ef
63003bf
e2355cb
1594c35
64ae0e3
947efe9
019a052
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| .DS_Store | ||
| build | ||
| /man/man1 | ||
| /man/man5 | ||
| /man/man8 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,13 @@ build: clean | |
| .PHONY: clean | ||
| clean: | ||
| @rm -rf ./build/* | ||
| @rm -rf ./man/man[1-9] | ||
|
|
||
| # run go test | ||
| # the "-tags daemon" part is temporary | ||
| .PHONY: test | ||
| test: | ||
| @go test -tags daemon -v $(shell go list ./... | grep -v /vendor/) | ||
| @go test -tags daemon -v $(shell go list ./... | grep -vE '/vendor/|github.com/docker/cli/man$$') | ||
|
|
||
| # run linters | ||
| .PHONY: lint | ||
|
|
@@ -32,10 +33,15 @@ cross: clean | |
| .PHONY: vendor | ||
| vendor: vendor.conf | ||
| @vndr 2> /dev/null | ||
| @script/validate/check-git-diff vendor | ||
| @scripts/validate/check-git-diff vendor | ||
|
|
||
| ## Generate man pages from go source and markdown | ||
| .PHONY: manpages | ||
| manpages: | ||
| @man/generate.sh | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This doesn't need to be I believe something like this would be correct:
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you use wildcards in But be careful: this: Does not cause
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess this would be easier to do if we wrote the man pages to
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not entirely sure how
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, I think that's how it works. I did it for |
||
|
|
||
| cli/compose/schema/bindata.go: cli/compose/schema/data/*.json | ||
| go generate github.com/docker/cli/cli/compose/schema | ||
|
|
||
| compose-jsonschema: cli/compose/schema/bindata.go | ||
| @script/validate/check-git-diff cli/compose/schema/bindata.go | ||
| @scripts/validate/check-git-diff cli/compose/schema/bindata.go | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| "Vendor": true, | ||
| "Deadline": "2m", | ||
| "Sort": ["linter", "severity", "path"], | ||
| "Exclude": ["cli/compose/schema/bindata.go"], | ||
| "Exclude": ["cli/compose/schema/bindata.go", "man/generate.go"], | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this necessary? I don't think we should exclude it from linting
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because packages are missing when linting. |
||
|
|
||
| "DisableAll": true, | ||
| "Enable": [ | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is it necessary to exclude the man directory from testing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because of missing packages, that are included only after the vendor-on-the-fly part of generate.sh