Skip to content

Commit

Permalink
(apro) build-aux: Doc changes suggested by Abhay
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeShu committed Aug 22, 2019
1 parent 8dfef2a commit d7ffbe2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions docker-cluster.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# - Variable: DOCKER_K8S_ENABLE_PVC ?=
## Outputs ##
# - Target : %.docker.tag.cluster # tags as $(docker.LOCALHOST):31000/$(notdir $*):IMAGE-ID
# - Target : %.docker.push.cluster # pushes tat tag to a private in-cluster registry
# - Target : %.docker.push.cluster # pushes that tag to a private in-cluster registry
## common.mk targets ##
# - clean
#
Expand All @@ -18,7 +18,14 @@
# > NOTE: On macOS, you will need to add
# > `host.docker.internal:31000` to Docker's list of "Insecure
# > registries" in order to push to private in-cluster registries.
# > Ask Abhay how to do that.
# >
# > Screenshot: ./docs/docker-cluster-macos-insecure-registries.png
# > Docs: https://docs.docker.com/registry/insecure/#deploy-a-plain-http-registry
# >
# > The docs say you need to do it through the GUI, but I've heard
# > rumors that `~/.docker/daemon.json` can be used for this.
# > Maybe it's sensitive to your version of Docker for Desktop, or
# > your version of macOS?
#
# You can push to a private in-cluster registry by depending on
# `SOMEDIR.docker.push.cluster`. It will be known in-cluster as
Expand Down
Binary file added docs/docker-cluster-macos-insecure-registries.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion go-mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ endif
# Example: $(call _go.file2dirs,foo/bar/baz) => foo foo/bar foo/bar/baz
_go.file2dirs = $(if $(findstring /,$1),$(call _go.file2dirs,$(patsubst %/,%,$(dir $1)))) $1
# Usage: $(call _go.files2dirs,FILE_LIST)
# Example: $(call _go.file2dirs,foo/bar/baz foo/baz/qux) => foo foo/bar foo/bar/baz foo/baz foo/baz/qux
# Example: $(call _go.files2dirs,foo/bar/baz foo/baz/qux) => foo foo/bar foo/bar/baz foo/baz foo/baz/qux
_go.files2dirs = $(sort $(foreach f,$1,$(call _go.file2dirs,$f)))
# Without pruning sub-module packages (relative to ".", without "./" prefix")
# Usage: $(call _go.raw.list,ARGS)
Expand Down

0 comments on commit d7ffbe2

Please sign in to comment.