Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
399 commits
Select commit Hold shift + click to select a range
1afd87e
man page fix: remove -e/--exec-drive=native related description
Jan 7, 2016
4aa3cb7
Added additional container information to "docker info".
netbrain Oct 27, 2015
ca0d410
Add docker network connect/disconnect to non-running container
coolljt0725 Jan 12, 2016
7c854f4
Add daemon documentation on user namespaces feature
estesp Jan 8, 2016
716f360
Add network interal mode
chenchun Dec 28, 2015
b86510e
daemon option (--storage-opt dm.basesize) for increasing the base dev…
Jan 12, 2016
422798e
Rename authz to authorization for greater clarity
Jan 13, 2016
3049e51
Add missing documentation for static IP options
aboch Jan 12, 2016
79c8a65
Forced endpoint cleanup
mavenugo Jan 13, 2016
4b28c05
Add network ID to container inspect
Jan 14, 2016
33c90c2
Network scoped alias support
mavenugo Jan 8, 2016
8dbba9e
Add IPAM Config Options to match libnetwork
rmb938 Oct 23, 2015
bd7f6fc
Allow to set daemon and server configurations in a file.
calavera Dec 10, 2015
efe1db8
Add Subnets info for user-defined network
Dec 28, 2015
26b01ec
Added `dead` to docs for docker ps -f status=...
karkhaz Jan 13, 2016
3bb809d
On container rm, don't remove named mountpoints
cpuguy83 Jan 22, 2016
18b8b86
Add note about mount propagation on systemd
cpuguy83 Jan 26, 2016
c01cdd7
Move tar copy-up for tmpfs mounts
crosbymichael Jan 25, 2016
5c1eff2
Improve wording about re-assigning IP addresses
bboreham Jan 26, 2016
f8f3546
docs: document options for default network driver
Jan 18, 2016
ea42c4e
Change container name to id as actual results
Jan 29, 2016
ae918a1
Allow disabling of colored Docker logs via daemon flag.
vincentwoo Dec 13, 2015
17172c9
Correct old virtual size
Feb 2, 2016
a567eae
Add note about legacy links
thaJeztah Feb 1, 2016
d15652c
Display `internal` flag on `network inspect`
chenchun Jan 15, 2016
b3f4a8e
Fix typo in config-json man page
Feb 5, 2016
9e09a07
Fix mention of at sign in docs
Feb 5, 2016
a678fd4
Adding --format= flag
eallrich Feb 6, 2016
439645f
Add a parent man page for docker volumes command
rhatdan Feb 10, 2016
4eabc1b
Add docs for --ipv6 option, also add --internal as appropriate
aidanhs Feb 12, 2016
ea40c96
Expose docker's root directory by default as part of `docker info`.
vishh Feb 4, 2016
4724a7e
Windows: Add ETW logging driver plug-in
cednation Jan 25, 2016
75f109f
Fix docs
WeiZhang555 Feb 17, 2016
fcb77b2
Document .Names format placeholder in docker-ps man page, fixes #20503.
fuzzbomb Feb 19, 2016
e13d00e
Update RestartPolicy of container
WeiZhang555 Jan 4, 2016
6dc30c4
fix storage driver options in man page
Feb 19, 2016
3327539
Fix some typos in comments and strings
stweil Feb 22, 2016
45621c2
Fix markdown style error in man page
Feb 23, 2016
230d30a
Add mounts to docker ps.
calavera Feb 3, 2016
28d962a
Fix some flaws in man.
zhangjianfnst Feb 25, 2016
8a1e318
Remove email address field from login
kencochrane Mar 1, 2016
fefcd37
daemon/logger: Add logging driver for Google Cloud Logging
mikedanese Dec 18, 2015
b4e1d2c
Remove some references to "register" through login
thaJeztah Mar 1, 2016
4a012e2
Add CgroupDriver to docker info
hqhq Feb 18, 2016
1573044
Support mount opts for `local` volume driver
cpuguy83 Feb 12, 2016
f213a46
Adds clarification to behavior of missing directories.
Mar 3, 2016
c5bf50c
Add support for NoNewPrivileges in docker
mrunalp Feb 22, 2016
f9d68cf
devmapper: Add a new option dm.min_free_space
rhvgoyal Mar 7, 2016
6ac2ae5
pids limit support
jessfraz Dec 15, 2015
55b4cf9
docs: extend: plugins: mention the sdk + systemd socket activation
runcom Mar 8, 2016
c75e013
docs: add $ before HOME
runcom Mar 12, 2016
d99e57f
docs: fix broken links
mountkin Mar 12, 2016
7ae694c
Run privileged containers when userns are specified
Feb 8, 2016
7fbcc7b
Update Docker pull examples
thaJeztah Mar 4, 2016
30095dc
Fix typo
WeiZhang555 Mar 17, 2016
e78c505
Fix documentation on --security-opt seccomp
rhatdan Mar 17, 2016
88fd865
Consolidate security options to use `=` as separator.
calavera Mar 15, 2016
bad2396
Fix plural typo in 'save' command help
Mar 21, 2016
039e36f
Remove unneeded references to execDriver
mlaventure Mar 18, 2016
077efc4
Add explicit flags for volume cp/no-cp
cpuguy83 Mar 15, 2016
120f2e4
Move ZFS options to correct place in man page
Mar 22, 2016
606e1ec
Update 'save' command help
Mar 22, 2016
771c525
add docs for `docker load --quiet`
albers Mar 24, 2016
2aac639
docs for labels on build, networks and volumes
albers Mar 25, 2016
7cfb9b5
Add man change for volume filter
Mar 28, 2016
6d90b55
fix wrong option name in `dm.min_free_space` examples
albers Mar 28, 2016
0463ed0
docs for `docker daemon --containerd`
albers Mar 28, 2016
abbe7f8
CLI flag for docker create(run) to change block device size.
Mar 20, 2016
1ee546f
Mention "docker login" in push/pull documentation
Mar 29, 2016
654c430
When using systemd, pass expected cgroupsPath and cli options to runc.
anusha-ragunathan Mar 24, 2016
9c19344
1.change validateNoSchema into validateNoScheme
allencloud Mar 29, 2016
34b5428
Add insecure registries to docker info
tkopczynski Feb 16, 2016
a76eba6
Change HumanSize to BytesSize for memory output in `docker stats`.
yongtang Apr 5, 2016
c07971f
Add support for setting sysctls
rhatdan Mar 29, 2016
2c6040a
Fixes #21701 devicemapper docs
Apr 12, 2016
48596d9
Add network label filter support
Mar 24, 2016
462a98e
Add load/save image event support
Apr 19, 2016
ef1888b
Update the `docker daemon` to `dockerd` for document
Apr 28, 2016
d9d4586
Add "driver" filter for network ls
thaJeztah Apr 25, 2016
26d54d5
Updated docker-info output and documentation
geekylucas Mar 14, 2016
01cd7b9
Add disk quota support for btrfs
Mar 24, 2016
1ec2501
Add support for reading logs extra attrs
cpuguy83 Apr 8, 2016
ced1317
Add the swapMemorySupport requirement to OOM tests
May 10, 2016
76c1230
Docker pull/push with max concurrency limits.
yongtang May 6, 2016
fede72a
Add support for --pid=container:<id>
mrunalp May 6, 2016
8b50845
Add a --filter option to `docker search`
May 20, 2016
b819438
Replace U+2018 and U+2019 with U+0027 in manpages
saser May 20, 2016
9aab0b2
Windows: Default to Hyper-V Containers on client
Apr 15, 2016
3de2c3b
Document valid chars in image name and tag
isubuz May 11, 2016
cefba85
update docs/reference/commandline/cp.md
AkihiroSuda May 23, 2016
725ca01
Add before and since filter to images
vdemeester May 25, 2016
fafb6ca
fix typos
allencloud May 8, 2016
9e57d0d
Add `--limit` option to `docker search`
yongtang Jun 1, 2016
205176d
man: mv config-json.5 to docker-config-json.5
runcom Jun 3, 2016
1b3ad56
attach: replace interface with simple type
LK4D4 Jun 3, 2016
c66cc89
Fix a couple of typos in docker attach docs.
yongtang Jun 5, 2016
317f617
network docs cleanup
thaJeztah Jun 6, 2016
7283b47
Fix a couple of typos in the docs of `docker attach`
yongtang Jun 7, 2016
3eab4d9
Adding network filter to docker ps command
May 27, 2016
3f3e6d8
add support for filtering by network ID
thaJeztah Jun 6, 2016
0c87fce
Update docker-load documentation
vdemeester Jun 8, 2016
57edd01
Add documentation for using overlay2
dmcgowan Jun 13, 2016
119016c
Add --live-restore flag
crosbymichael Jun 2, 2016
7a4bfc2
Allow user to specify container's link-local addresses
aboch Jun 9, 2016
f2bf4ae
Update docker info output example
thaJeztah Jun 16, 2016
da31efc
Man page fix: Mention supported drivers for --storage-opt size option…
Jun 21, 2016
b1dbdf3
update go-md2man to v1.0.5
AkihiroSuda Jun 23, 2016
41ee433
make cmd short short consistency and change docs
allencloud Jun 30, 2016
61ede6f
man: add missing --add-runtime
runcom Jul 2, 2016
8faf9a1
Soften limitation of update kernel memory
hqhq Jul 12, 2016
3ecf417
Clarify warning against using build-time variables for secrets
hairyhenderson Jul 12, 2016
cf6e723
Rename `--net` to `--network`
Jun 6, 2016
7d5bd20
docs: cleanup docker update docs
thaJeztah Jul 12, 2016
5decb80
Improve flag help consistency, and update docs
thaJeztah Jul 15, 2016
f8c9ece
better command `docker network create -h` output
allencloud Jul 16, 2016
3a2c459
bump Go to 1.6.3
thaJeztah Jul 18, 2016
82b607a
Add a script to generate man pages from cobra commands.
dnephin Jun 9, 2016
b6cf3e7
Set Long text for volume commands so they can be used to generate man…
dnephin Jun 20, 2016
14abd38
Dont run man generation as part of test-unit.
dnephin Jun 22, 2016
c4b439f
Make README less scabious
justincormack Jul 22, 2016
babb917
Split advertised address from listen address
Jul 1, 2016
515d548
Require listen address and advertise address to be an IP address or a…
Jul 21, 2016
08e8de4
Fix kernel memory updating docs
hqhq Jul 27, 2016
c8ff32d
Fix the man/Dockerfile for arm
dnephin Jul 28, 2016
d87ef58
Update `--user`/`-u` flag in man page of `docker create`
yongtang Aug 3, 2016
4abcc4b
Add network --format flag to ls
vdemeester Aug 4, 2016
7d85c86
Fix update memory without memoryswap
coolljt0725 Aug 8, 2016
e796ed3
Wait container's removal via Events API
WeiZhang555 Jun 9, 2016
17e2a3e
Linux upstream kernel Overlay file systems support SELinux
rhatdan Aug 11, 2016
bb3ea66
Fix inspect network show gateway with mask
coolljt0725 Aug 12, 2016
c95ed91
Fix capitalization
thaJeztah Aug 15, 2016
0f979bb
add `--format` flag to `docker info`
AkihiroSuda Jun 21, 2016
3c768c6
Forbid update restart policy of container with AutoRemove flag
WeiZhang555 Aug 15, 2016
acc122d
Use the correct version of glide
cpuguy83 Aug 19, 2016
1864e3e
ppc64le: add support for building docker debs for xenial
tophj-ibm May 27, 2016
ef9a851
Add a Dockerfile for generating manpages on aarch64
justincormack Aug 19, 2016
e35e2a0
Add a Dockerfile for generating manpages on s390x
justincormack Aug 19, 2016
e12713a
Remove old cli framework.
dnephin Jun 23, 2016
ded9ce4
Refactor `docker inspect` to work on all types
Jun 16, 2016
f2f37ff
Modify restart function prompt
Aug 30, 2016
dddf62f
Modify rename function usage
Sep 1, 2016
83ff336
Modify docker-restart.1.md
Sep 2, 2016
2e14234
fix the man page and zsh completion for `docker images`
AkihiroSuda Sep 2, 2016
4d8e306
fix docs about `sudo docker login`
AkihiroSuda Sep 5, 2016
9b3749d
Fix incorrect help output in `docker network ls`
yongtang Sep 5, 2016
82b73af
Update man page for `docker create` to add `--rm` flag
yongtang Sep 5, 2016
be11f1b
update go-md2man to v1.0.6
AkihiroSuda Sep 8, 2016
d005d05
Move api/client -> cli/command
dnephin Sep 8, 2016
f19f6ac
add `docker events --format`
AkihiroSuda Sep 2, 2016
5e388d1
Synchronize push reference with man page
thaJeztah Sep 15, 2016
ef1746e
Add init process for zombie fighting
crosbymichael Jun 27, 2016
809276c
overlay2: add support for --storage-opt size
Sep 18, 2016
c2646f9
Add documentation for docker stats --format
boaz0 Sep 25, 2016
500fb3f
Update man page for dm.xfs_nospace_max_retries
thaJeztah Sep 26, 2016
c6116f1
Fix incorrect aux-address examples and test
thaJeztah Sep 26, 2016
deddca7
configure docker-init binary path
runcom Sep 27, 2016
29b5ad4
Add a new "is-task" ps filter
vdemeester Sep 28, 2016
1732bd2
Add support for compressing build context during image build
reaperhulk Aug 18, 2016
7f19f46
daemon: add --userland-proxy-path flag
runcom Sep 24, 2016
1f04714
Implement Pause Resume support for Windows
darstahl Sep 9, 2016
9287e93
Add config parameter to change per-container stop timeout during daem…
yongtang May 26, 2016
c65e497
Fix typs from go to Go
yuexiao-wang Oct 18, 2016
a32e0a5
Add config parameter to change stop timeout during daemon shutdown
yongtang May 26, 2016
0321bd0
Update sfp13/pflag
dnephin Oct 18, 2016
564e99b
Fix the typo of URLs
Oct 19, 2016
c14f1cb
Exec: Add ability to set environment variables
jwendell Jul 13, 2016
18191c3
Make experimental a runtime flag
mlaventure Oct 6, 2016
84d4bcf
add --network option for docker build
sandyskies Mar 6, 2016
0583787
Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
erikstmartin Jun 7, 2016
5386414
Add --format to man and fix some typos
yuexiao-wang Oct 28, 2016
6a0a021
Adds container health support to docker ps filter
Jul 15, 2016
d22d8cc
Complete docker-events man page with filter list…
vdemeester Oct 28, 2016
b9e0c7e
Fix bunch of typos
hqhq Oct 29, 2016
baf4c90
Modify short and flags for docker inspect
yuexiao-wang Sep 18, 2016
11ce68f
Convert Unused ARG error to warning
addamh Oct 16, 2016
1435706
Adds ability to squash image after build
cpuguy83 Apr 21, 2016
11f3f4b
daemon: add a flag to override the default seccomp profile
runcom Sep 2, 2016
7e58974
cli: add `--mount` to `docker run`
AkihiroSuda Oct 25, 2016
422eb19
project: use vndr for vendoring
LK4D4 Oct 31, 2016
6fd8efb
Add `--cpus` flag to control cpu resources
yongtang Nov 1, 2016
7eaabbf
Windows: Add cpu count option
darstahl Nov 1, 2016
a4840c0
Align arg with other cli
Nov 5, 2016
ac2014c
Add `--dns-option` to `docker run` and hide `--dns-opt`
yongtang Nov 9, 2016
6220ef0
Update docs for `docker info` for most recent changes.
yongtang Nov 11, 2016
a5f3022
man page: consistent indents for flag descriptions
jonboulle Nov 15, 2016
2154052
Updated daemon documentation to clarify that live-restore is not supp…
bbayani Nov 14, 2016
8deaff1
man/docker: wrap lines consistently
jonboulle Nov 15, 2016
91f4072
Update stats cli reference documentation
vdemeester Nov 16, 2016
86aab64
fix typo
allencloud Nov 18, 2016
720e21d
Change the docker-tag usage text to be clearer
boaz0 Nov 13, 2016
6199f76
Rename Remote API to Engine API
bfirsh Nov 15, 2016
f2afbb4
Update docker info cli reference documentation
vdemeester Nov 23, 2016
c1d8219
Added and example of using --format with docker images
ipbabble Nov 23, 2016
37ce4df
28600: Docs: network connect for container in Created/Stopped state
Nov 18, 2016
f021af3
cli: remove `--mount` from `docker run`
AkihiroSuda Nov 25, 2016
ae04459
fix the mistake of present
Nov 26, 2016
c5c4243
modify some urls related to reference path
lixiaobing1 Nov 30, 2016
d0db94e
rectify several wrong URLs in branch of man
lixiaobing1 Dec 1, 2016
d61f48b
add SCOPE field content for docker network ls
lixiaobing1 Dec 8, 2016
b334e25
Update the option 'network' for docker build
yuexiao-wang Dec 9, 2016
06a586d
Fix the incorrect option name
yuexiao-wang Dec 13, 2016
fbda88d
Update the manual for docker wait
yuexiao-wang Dec 14, 2016
ce6a8bf
Add docs for `docker network create --attachable`
albers Dec 14, 2016
70c8043
Fix inconsistency for pause and unpause
yuexiao-wang Dec 15, 2016
ab52ea0
[docs,man] Fixed typo (#29516)
michael-k Dec 19, 2016
3d7ab79
Add docker-update description ommited in docker.1.md
lixiaobing1 Dec 14, 2016
c286340
Clarify what docker diff shows
Dec 20, 2016
ff95df5
Add missing "--default-runtime" flag in manpage
WeiZhang555 Dec 17, 2016
8c291d9
Update the manuals of docker and dockerd
yuexiao-wang Dec 22, 2016
06c53be
Read long description from a file.
dnephin Sep 22, 2016
61e7109
Docs: Be more clear when specifying valid formats for strings
timthelion Jan 2, 2017
9885852
replace no-remove by sample-volume-plugin in docs
vieux Dec 14, 2016
27ce16e
keep network option consistent between network connect and run
yuexiao-wang Dec 28, 2016
6244e31
Provide correct command imformation and URL
lixiaobing1 Jan 6, 2017
3a9c28b
Fix incorrect alias and URL
yuexiao-wang Jan 9, 2017
70b72d0
Clarify `cp` documentation behaviour with trailing "/."
Jan 13, 2017
01cc7a8
Add docs for `run|create --init|--init-path`
albers Jan 19, 2017
3f8e7f6
Allow adding rules to cgroup devices.allow on container create/run
mlaventure May 6, 2016
e9cb014
Add example for device-cgroup-rule to man
mlaventure Jan 13, 2017
fb1816e
Add daemon option --default-shm-size
yongtang Dec 25, 2016
c568032
Add markdown for man page of `docker plugin ls`
yongtang Feb 1, 2017
a376ca2
Make markdown for man pages of `docker container ...` consistent
yongtang Feb 2, 2017
a4f91c3
from golang:1.7.5-alpine for docker-manpage-dev
andrewhsu Feb 6, 2017
7e92b54
use precompiled go from google, needs debian to work
andrewhsu Feb 6, 2017
b349155
remove musl-dev in man/Dockerfile.armhf
andrewhsu Feb 6, 2017
336c8a6
added ppc64le and s390x fixes for manpages
tophj-ibm Feb 6, 2017
3d8721a
Update API history and man page for `--filter expose/publish`
yongtang Feb 2, 2017
24df13a
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
tianon Feb 13, 2017
f9e9540
[Docs] Add docs for stating stopped containers
WeiZhang555 Feb 15, 2017
5c383f8
why there are so many mistakes in our repo (up to /cmd)
xulike666 Feb 16, 2017
3dbc56b
fix some typos from module contrib to man
xulike666 Feb 16, 2017
9886074
Fix whitespace error.
pastcompute Feb 19, 2017
3289e52
Add --add-host for docker build
tabboud Jan 13, 2017
8a1dd98
Improved aarch64 build
docbobo Feb 20, 2017
759a39e
Incorporated feedback from review
docbobo Mar 1, 2017
5cafdb8
Enhance network inspect to show all tasks, local & non-local, in swar…
Mar 9, 2017
a6eeec3
Documentation for bind mount consistency flags.
yallop Mar 10, 2017
464c687
Add `reference` filter to the list of available filters
vdemeester Mar 21, 2017
c24f769
Add `--filter scope=swarm|local` for `docker network ls`
yongtang Mar 3, 2017
fbed3e2
Allow user to modify ingress network
aboch Mar 9, 2017
e2752b0
Update "man" of docker-run
mapk0y Mar 27, 2017
fc4ad8c
Deprecate --graph flag; Replace with --data-root
Nov 22, 2016
986fc33
cli: add `--mount` to `docker run`
AkihiroSuda Mar 31, 2017
d5a19ef
remove --init-path from client
runcom Apr 10, 2017
63003bf
Minor fixups for history CLI reference
thaJeztah Apr 16, 2017
e2355cb
docs/dockerd: correct authz plugin chain semantics
May 1, 2017
1594c35
Add option to auto-configure blkdev for devmapper
cpuguy83 Feb 16, 2017
64ae0e3
Add `docker build --iidfile=FILE`
Apr 6, 2017
947efe9
Import man pages
May 11, 2017
019a052
Reuse main Dockerfile to generate man pages
May 11, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.DS_Store
build
/man/man1
/man/man5
/man/man8
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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$$')
Copy link
Contributor

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?

Copy link
Collaborator Author

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


# run linters
.PHONY: lint
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't need to be .PHONY, this is one of the rare cases when a Makefile is actually appropriate.

I believe something like this would be correct:

man/man*: man/
    @man/generate.sh

manpages: man/man*

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use wildcards in Makefile rules like that? I didn't think so, you would need $(wildcard man/man*), I think.

But be careful: this:

foo bar: baz
     make-foo-and-bar baz

Does not cause make-foo-and-bar baz to run once whenever baz changes. It will be run once for foo and once for bar. That is unlikely to be what you wanted, at least judging from the lack of parameters to man/generate.sh in your example (if it had been passed $@ then it might be correct).

Copy link
Contributor

Choose a reason for hiding this comment

The 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 man/dist/ then the target would be just that string without the need for wildcards.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not entirely sure how make deals with targets or dependencies which are directories rather then files, but if that sort of thing works (I guess it just stats and uses the mtime just like for a file), sure.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think that's how it works. I did it for vendor (in this Makefile) and it seems to work so far.


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
5 changes: 5 additions & 0 deletions docker.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,8 @@ lint: build_linter_image
.PHONY: vendor
vendor: build_docker_image vendor.conf
@docker run -ti --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make vendor

## Generate man pages from go source and markdown
.PHONY: manpages
manpages: build_docker_image
@docker run -ti --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make manpages
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

FROM golang:1.8-alpine

RUN apk add -U git make
RUN apk add -U git make bash

RUN go get github.com/LK4D4/vndr && \
cp /go/bin/vndr /usr/bin && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

FROM golang:1.8-alpine

RUN apk add -U git make
RUN apk add -U git make bash

RUN go get github.com/LK4D4/vndr && \
cp /go/bin/vndr /usr/bin && \
Expand Down
2 changes: 1 addition & 1 deletion gometalinter.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Copy link
Contributor

Choose a reason for hiding this comment

The 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

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because packages are missing when linting.


"DisableAll": true,
"Enable": [
Expand Down
Loading