Skip to content

Commit

Permalink
Spelling fixes
Browse files Browse the repository at this point in the history
* additional
* ambiguous
* anonymous
* anything
* application
* because
* before
* building
* capabilities
* circumstances
* commit
* committer
* compresses
* concatenated
* config
* container
* container's
* current
* definition
* delimiter
* disassociates
* discovery
* distributed
* doesnotexist
* downloads
* duplicates
* either
* enhancing
* enumerate
* escapable
* exactly
* expect
* expectations
* expected
* explicitly
* false
* filesystem
* following
* forbidden
* git with
* healthcheck
* ignore
* independent
* inheritance
* investigating
* irrelevant
* it
* logging
* looking
* membership
* mimic
* minimum
* modify
* mountpoint
* multiline
* notifier
* outputting
* outside
* overridden
* override
* parsable
* plugins
* precedence
* propagation
* provided
* provides
* registries
* repositories
* returning
* settings
* should
* signals
* someone
* something
* specifically
* successfully
* synchronize
* they've
* thinking
* uninitialized
* unintentionally
* unmarshaling
* unnamed
* unreferenced
* verify

Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
jsoref authored and thaJeztah committed Jul 3, 2017
1 parent acd20d8 commit 39bcaee
Show file tree
Hide file tree
Showing 72 changed files with 129 additions and 129 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ be found.
* Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe [#31666](https://github.com/docker/docker/pull/31666)
* Ignore cgroup2 mountpoints [opencontainers/runc#1266](https://github.com/opencontainers/runc/pull/1266)
* Update containerd to 4ab9917febca54791c5f071a9d1f404867857fcc [#31662](https://github.com/docker/docker/pull/31662) [#31852](https://github.com/docker/docker/pull/31852)
* Register healtcheck service before calling restore() [docker/containerd#609](https://github.com/docker/containerd/pull/609)
* Register healthcheck service before calling restore() [docker/containerd#609](https://github.com/docker/containerd/pull/609)
* Fix `docker exec` not working after unattended upgrades that reload apparmor profiles [#31773](https://github.com/docker/docker/pull/31773)
* Fix unmounting layer without merge dir with Overlay2 [#31069](https://github.com/docker/docker/pull/31069)
* Do not ignore "volume in use" errors when force-delete [#31450](https://github.com/docker/docker/pull/31450)
Expand Down Expand Up @@ -1087,12 +1087,12 @@ installing docker, please make sure to update them accordingly.
+ Add security options to `docker info` output [#21172](https://github.com/docker/docker/pull/21172) [#23520](https://github.com/docker/docker/pull/23520)
+ Add insecure registries to `docker info` output [#20410](https://github.com/docker/docker/pull/20410)
+ Extend Docker authorization with TLS user information [#21556](https://github.com/docker/docker/pull/21556)
+ devicemapper: expose Mininum Thin Pool Free Space through `docker info` [#21945](https://github.com/docker/docker/pull/21945)
+ devicemapper: expose Minimum Thin Pool Free Space through `docker info` [#21945](https://github.com/docker/docker/pull/21945)
* API now returns a JSON object when an error occurs making it more consistent [#22880](https://github.com/docker/docker/pull/22880)
- Prevent `docker run -i --restart` from hanging on exit [#22777](https://github.com/docker/docker/pull/22777)
- Fix API/CLI discrepancy on hostname validation [#21641](https://github.com/docker/docker/pull/21641)
- Fix discrepancy in the format of sizes in `stats` from HumanSize to BytesSize [#21773](https://github.com/docker/docker/pull/21773)
- authz: when request is denied return forbbiden exit code (403) [#22448](https://github.com/docker/docker/pull/22448)
- authz: when request is denied return forbidden exit code (403) [#22448](https://github.com/docker/docker/pull/22448)
- Windows: fix tty-related displaying issues [#23878](https://github.com/docker/docker/pull/23878)

### Runtime
Expand Down Expand Up @@ -1887,7 +1887,7 @@ by another client (#15489)

#### Remote API

- Fix unmarshalling of Command and Entrypoint
- Fix unmarshaling of Command and Entrypoint
- Set limit for minimum client version supported
- Validate port specification
- Return proper errors when attach/reattach fail
Expand Down Expand Up @@ -2572,7 +2572,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
- Fix ADD caching issue with . prefixed path
- Fix docker build on devicemapper by reverting sparse file tar option
- Fix issue with file caching and prevent wrong cache hit
* Use same error handling while unmarshalling CMD and ENTRYPOINT
* Use same error handling while unmarshaling CMD and ENTRYPOINT

#### Documentation

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RUN set -x \
&& rm -rf "$SECCOMP_PATH"

# Install Go
# We don't have official binary golang 1.7.5 tarballs for ARM64, eigher for Go or
# We don't have official binary golang 1.7.5 tarballs for ARM64, either for Go or
# bootstrap, so we use golang-go (1.6) as bootstrap to build Go from source code.
# We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because
# not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8.
Expand Down
2 changes: 1 addition & 1 deletion api/server/router/container/container_routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (s *containerRouter) getContainersLogs(ctx context.Context, w http.Response
}

// doesn't matter what version the client is on, we're using this internally only
// also do we need size? i'm thinkin no we don't
// also do we need size? i'm thinking no we don't
raw, err := s.backend.ContainerInspect(containerName, false, api.DefaultVersion)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion api/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,7 @@ definitions:
may not be applied if the version number has changed from the last read. In other words,
if two update requests specify the same base version, only one of the requests can succeed.
As a result, two separate update requests that happen at the same time will not
unintentially overwrite each other.
unintentionally overwrite each other.
type: "object"
properties:
Index:
Expand Down
2 changes: 1 addition & 1 deletion api/types/filters/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func TestArgsMatch(t *testing.T) {
"created": {"tod": true}},
}: "created",
{map[string]map[string]bool{
"created": {"anyting": true, "to*": true}},
"created": {"anything": true, "to*": true}},
}: "created",
}

Expand Down
2 changes: 1 addition & 1 deletion api/types/swarm/swarm.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package swarm

import "time"

// ClusterInfo represents info about the cluster for outputing in "info"
// ClusterInfo represents info about the cluster for outputting in "info"
// it contains the same information as "Swarm", but without the JoinTokens
type ClusterInfo struct {
ID string
Expand Down
6 changes: 3 additions & 3 deletions builder/dockerfile/buildargs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ func TestGetAllAllowed(t *testing.T) {
})

buildArgs.AddMetaArg("ArgFromMeta", strPtr("frommeta1"))
buildArgs.AddMetaArg("ArgFromMetaOverriden", strPtr("frommeta2"))
buildArgs.AddMetaArg("ArgFromMetaOverridden", strPtr("frommeta2"))
buildArgs.AddMetaArg("ArgFromMetaNotUsed", strPtr("frommeta3"))

buildArgs.AddArg("ArgOverriddenByOptions", strPtr("fromdockerfile2"))
buildArgs.AddArg("ArgWithDefaultInDockerfile", strPtr("fromdockerfile1"))
buildArgs.AddArg("ArgNoDefaultInDockerfile", nil)
buildArgs.AddArg("ArgNoDefaultInDockerfileFromOptions", nil)
buildArgs.AddArg("ArgFromMeta", nil)
buildArgs.AddArg("ArgFromMetaOverriden", strPtr("fromdockerfile3"))
buildArgs.AddArg("ArgFromMetaOverridden", strPtr("fromdockerfile3"))

all := buildArgs.GetAllAllowed()
expected := map[string]string{
Expand All @@ -37,7 +37,7 @@ func TestGetAllAllowed(t *testing.T) {
"ArgWithDefaultInDockerfile": "fromdockerfile1",
"ArgNoDefaultInDockerfileFromOptions": "fromopt3",
"ArgFromMeta": "frommeta1",
"ArgFromMetaOverriden": "fromdockerfile3",
"ArgFromMetaOverridden": "fromdockerfile3",
}
assert.Equal(t, expected, all)
}
Expand Down
2 changes: 1 addition & 1 deletion client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ type Client struct {
// CheckRedirect specifies the policy for dealing with redirect responses:
// If the request is non-GET return `ErrRedirect`. Otherwise use the last response.
//
// Go 1.8 changes behavior for HTTP redirects (specificlaly 301, 307, and 308) in the client .
// Go 1.8 changes behavior for HTTP redirects (specifically 301, 307, and 308) in the client .
// The Docker client (and by extension docker API client) can be made to to send a request
// like POST /containers//start where what would normally be in the name section of the URL is empty.
// This triggers an HTTP 301 from the daemon.
Expand Down
4 changes: 2 additions & 2 deletions client/container_wait.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
// indicated by the given condition, either "not-running" (default),
// "next-exit", or "removed".
//
// If this client's API version is beforer 1.30, condition is ignored and
// If this client's API version is before 1.30, condition is ignored and
// ContainerWait will return immediately with the two channels, as the server
// will wait as if the condition were "not-running".
//
Expand All @@ -23,7 +23,7 @@ import (
// then returns two channels on which the caller can wait for the exit status
// of the container or an error if there was a problem either beginning the
// wait request or in getting the response. This allows the caller to
// sychronize ContainerWait with other calls, such as specifying a
// synchronize ContainerWait with other calls, such as specifying a
// "next-exit" condition before issuing a ContainerStart request.
func (cli *Client) ContainerWait(ctx context.Context, containerID string, condition container.WaitCondition) (<-chan container.ContainerWaitOKBody, <-chan error) {
if versions.LessThan(cli.ClientVersion(), "1.30") {
Expand Down
2 changes: 1 addition & 1 deletion container/container_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfi
cResources := &container.HostConfig.Resources

// validate NanoCPUs, CPUPeriod, and CPUQuota
// Becuase NanoCPU effectively updates CPUPeriod/CPUQuota,
// Because NanoCPU effectively updates CPUPeriod/CPUQuota,
// once NanoCPU is already set, updating CPUPeriod/CPUQuota will be blocked, and vice versa.
// In the following we make sure the intended update (resources) does not conflict with the existing (cResource).
if resources.NanoCPUs > 0 && cResources.CPUPeriod > 0 {
Expand Down
2 changes: 1 addition & 1 deletion container/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const (
// timeouts, and avoiding goroutine leaks. Wait must be called without holding
// the state lock. Returns a channel from which the caller will receive the
// result. If the container exited on its own, the result's Err() method will
// be nil and its ExitCode() method will return the conatiners exit code,
// be nil and its ExitCode() method will return the container's exit code,
// otherwise, the results Err() method will return an error indicating why the
// wait operation failed.
func (s *State) Wait(ctx context.Context, condition WaitCondition) <-chan StateStatus {
Expand Down
2 changes: 1 addition & 1 deletion daemon/cluster/executor/container/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ func (r *controller) Shutdown(ctx context.Context) error {
}

// add a delay for gossip converge
// TODO(dongluochen): this delay shoud be configurable to fit different cluster size and network delay.
// TODO(dongluochen): this delay should be configurable to fit different cluster size and network delay.
time.Sleep(defaultGossipConvergeDelay)
}

Expand Down
4 changes: 2 additions & 2 deletions daemon/discovery/discovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ func TestDiscoveryOpts(t *testing.T) {
t.Fatalf("Heartbeat - Expected : %v, Actual : %v", expected, heartbeat)
}

discaveryTTL := fmt.Sprintf("%d", defaultDiscoveryTTLFactor-1)
clusterOpts = map[string]string{"discovery.ttl": discaveryTTL}
discoveryTTL := fmt.Sprintf("%d", defaultDiscoveryTTLFactor-1)
clusterOpts = map[string]string{"discovery.ttl": discoveryTTL}
heartbeat, ttl, err = discoveryOpts(clusterOpts)
if err == nil && heartbeat == 0 {
t.Fatal("discovery.heartbeat must be positive")
Expand Down
2 changes: 1 addition & 1 deletion daemon/events/events_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ func TestLoadBufferedEventsOnlyFromPast(t *testing.T) {
}

// #13753
func TestIngoreBufferedWhenNoTimes(t *testing.T) {
func TestIgnoreBufferedWhenNoTimes(t *testing.T) {
m1, err := eventstestutils.Scan("2016-03-07T17:28:03.022433271+02:00 container die 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
if err != nil {
t.Fatal(err)
Expand Down
10 changes: 5 additions & 5 deletions daemon/graphdriver/devmapper/device_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,27 +174,27 @@ func writeLVMConfig(root string, cfg directLVMConfig) error {
func setupDirectLVM(cfg directLVMConfig) error {
pvCreate, err := exec.LookPath("pvcreate")
if err != nil {
return errors.Wrap(err, "error lookuping up command `pvcreate` while setting up direct lvm")
return errors.Wrap(err, "error looking up command `pvcreate` while setting up direct lvm")
}

vgCreate, err := exec.LookPath("vgcreate")
if err != nil {
return errors.Wrap(err, "error lookuping up command `vgcreate` while setting up direct lvm")
return errors.Wrap(err, "error looking up command `vgcreate` while setting up direct lvm")
}

lvCreate, err := exec.LookPath("lvcreate")
if err != nil {
return errors.Wrap(err, "error lookuping up command `lvcreate` while setting up direct lvm")
return errors.Wrap(err, "error looking up command `lvcreate` while setting up direct lvm")
}

lvConvert, err := exec.LookPath("lvconvert")
if err != nil {
return errors.Wrap(err, "error lookuping up command `lvconvert` while setting up direct lvm")
return errors.Wrap(err, "error looking up command `lvconvert` while setting up direct lvm")
}

lvChange, err := exec.LookPath("lvchange")
if err != nil {
return errors.Wrap(err, "error lookuping up command `lvchange` while setting up direct lvm")
return errors.Wrap(err, "error looking up command `lvchange` while setting up direct lvm")
}

if cfg.AutoExtendPercent == 0 {
Expand Down
2 changes: 1 addition & 1 deletion daemon/graphdriver/driver_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func GetFSMagic(rootpath string) (FsMagic, error) {
return FsMagic(buf.Type), nil
}

// NewFsChecker returns a checker configured for the provied FsMagic
// NewFsChecker returns a checker configured for the provided FsMagic
func NewFsChecker(t FsMagic) Checker {
return &fsChecker{
t: t,
Expand Down
2 changes: 1 addition & 1 deletion daemon/graphdriver/driver_solaris.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (c *fsChecker) IsMounted(path string) bool {
return m
}

// NewFsChecker returns a checker configured for the provied FsMagic
// NewFsChecker returns a checker configured for the provided FsMagic
func NewFsChecker(t FsMagic) Checker {
return &fsChecker{
t: t,
Expand Down
2 changes: 1 addition & 1 deletion daemon/graphdriver/quota/projectquota.go
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ func makeBackingFsDev(home string) (string, error) {
}

backingFsBlockDev := path.Join(home, "backingFsBlockDev")
// Re-create just in case comeone copied the home directory over to a new device
// Re-create just in case someone copied the home directory over to a new device
syscall.Unlink(backingFsBlockDev)
stat := fileinfo.Sys().(*syscall.Stat_t)
if err := syscall.Mknod(backingFsBlockDev, syscall.S_IFBLK|0600, int(stat.Dev)); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion daemon/graphdriver/windows/windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ func (d *Driver) Remove(id string) error {
//
// TODO @jhowardmsft - For RS3, we can remove the retries. Also consider
// using platform APIs (if available) to get this more succinctly. Also
// consider enlighting the Remove() interface to have context of why
// consider enhancing the Remove() interface to have context of why
// the remove is being called - that could improve efficiency by not
// enumerating compute systems during a remove of a container as it's
// not required.
Expand Down
2 changes: 1 addition & 1 deletion daemon/logger/awslogs/cloudwatchlogs.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ var newTicker = func(freq time.Duration) *time.Ticker {
// awslogs-datetime-format options have been configured, multiline processing
// is enabled, where log messages are stored in an event buffer until a multiline
// pattern match is found, at which point the messages in the event buffer are
// pushed to CloudWatch logs as a single log event. Multline messages are processed
// pushed to CloudWatch logs as a single log event. Multiline messages are processed
// according to the maximumBytesPerPut constraint, and the implementation only
// allows for messages to be buffered for a maximum of 2*batchPublishFrequency
// seconds. When events are ready to be processed for submission to CloudWatch
Expand Down
2 changes: 1 addition & 1 deletion daemon/logger/ring.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (r *RingLogger) run() {

type messageRing struct {
mu sync.Mutex
// singals callers of `Dequeue` to wake up either on `Close` or when a new `Message` is added
// signals callers of `Dequeue` to wake up either on `Close` or when a new `Message` is added
wait *sync.Cond

sizeBytes int64 // current buffer size
Expand Down
2 changes: 1 addition & 1 deletion daemon/oci_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
}

// If the container has not been started, and has configs or secrets
// secrets, create symlinks to each confing and secret. If it has been
// secrets, create symlinks to each config and secret. If it has been
// started before, the symlinks should have already been created. Also, it
// is important to not mount a Hyper-V container that has been started
// before, to protect the host from the container; for example, from
Expand Down
6 changes: 3 additions & 3 deletions daemon/reload.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (daemon *Daemon) Reload(conf *config.Config) (err error) {

daemon.reloadPlatform(conf, attributes)
daemon.reloadDebug(conf, attributes)
daemon.reloadMaxConcurrentDowloadsAndUploads(conf, attributes)
daemon.reloadMaxConcurrentDownloadsAndUploads(conf, attributes)
daemon.reloadShutdownTimeout(conf, attributes)

if err := daemon.reloadClusterDiscovery(conf, attributes); err != nil {
Expand Down Expand Up @@ -74,9 +74,9 @@ func (daemon *Daemon) reloadDebug(conf *config.Config, attributes map[string]str
attributes["debug"] = fmt.Sprintf("%t", daemon.configStore.Debug)
}

// reloadMaxConcurrentDowloadsAndUploads updates configuration with max concurrent
// reloadMaxConcurrentDownloadsAndUploads updates configuration with max concurrent
// download and upload options and updates the passed attributes
func (daemon *Daemon) reloadMaxConcurrentDowloadsAndUploads(conf *config.Config, attributes map[string]string) {
func (daemon *Daemon) reloadMaxConcurrentDownloadsAndUploads(conf *config.Config, attributes map[string]string) {
// If no value is set for max-concurrent-downloads we assume it is the default value
// We always "reset" as the cost is lightweight and easy to maintain.
if conf.IsValueSet("max-concurrent-downloads") && conf.MaxConcurrentDownloads != nil {
Expand Down
2 changes: 1 addition & 1 deletion daemon/volumes_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func TestBackportMountSpec(t *testing.T) {
BindOptions: &mounttypes.BindOptions{Propagation: "shared"},
},
},
comment: "bind mount with read/write + shared propgation",
comment: "bind mount with read/write + shared propagation",
},
{
mp: &volume.MountPoint{
Expand Down
2 changes: 1 addition & 1 deletion distribution/metadata/v2_metadata_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func (serv *v2MetadataService) TagAndAdd(diffID layer.DiffID, hmacKey []byte, me
return serv.Add(diffID, meta)
}

// Remove unassociates a metadata entry from a layer DiffID.
// Remove disassociates a metadata entry from a layer DiffID.
func (serv *v2MetadataService) Remove(metadata V2Metadata) error {
if serv.store == nil {
// Support a service which has no backend storage, in this case
Expand Down
2 changes: 1 addition & 1 deletion distribution/push_v2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func TestLayerAlreadyExists(t *testing.T) {
expectedRequests: []string{"apple"},
},
{
name: "not matching reposies",
name: "not matching repositories",
targetRepo: "busybox",
maxExistenceChecks: 3,
metadata: []metadata.V2Metadata{
Expand Down
4 changes: 2 additions & 2 deletions dockerversion/useragent.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ func escapeStr(s string, charsToEscape string) string {
var ret string
for _, currRune := range s {
appended := false
for _, escapeableRune := range charsToEscape {
if currRune == escapeableRune {
for _, escapableRune := range charsToEscape {
if currRune == escapableRune {
ret += `\` + string(currRune)
appended = true
break
Expand Down
2 changes: 1 addition & 1 deletion docs/api/v1.24.md
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ Get `stdout` and `stderr` logs from the container ``id``

**Query parameters**:

- **details** - 1/True/true or 0/False/flase, Show extra details provided to logs. Default `false`.
- **details** - 1/True/true or 0/False/false, Show extra details provided to logs. Default `false`.
- **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
- **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
- **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
Expand Down
4 changes: 2 additions & 2 deletions hack/Jenkins/W2L/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SCRIPT_VER="Wed Apr 20 18:30:19 UTC 2016"
# - Error if running 32-bit posix tools. Probably can take from bash --version and check contains "x86_64"
# - Warn if the CI directory cannot be deleted afterwards. Otherwise turdlets are left behind
# - Use %systemdrive% ($SYSTEMDRIVE) rather than hard code to c: for TEMP
# - Consider cross builing the Windows binary and copy across. That's a bit of a heavy lift. Only reason
# - Consider cross building the Windows binary and copy across. That's a bit of a heavy lift. Only reason
# for doing that is that it mirrors the actual release process for docker.exe which is cross-built.
# However, should absolutely not be a problem if built natively, so nit-picking.
# - Tidy up of images and containers. Either here, or in the teardown script.
Expand Down Expand Up @@ -116,7 +116,7 @@ fi
# Get the commit has and verify we have something
if [ $ec -eq 0 ]; then
export COMMITHASH=$(git rev-parse --short HEAD)
echo INFO: Commmit hash is $COMMITHASH
echo INFO: Commit hash is $COMMITHASH
if [ -z $COMMITHASH ]; then
echo "ERROR: Failed to get commit hash. Are you sure this is a docker repository?"
ec=1
Expand Down
2 changes: 1 addition & 1 deletion hack/integration-cli-on-swarm/host/enumerate.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func enumerateTestsForBytes(b []byte) ([]string, error) {
return tests, nil
}

// enumareteTests enumerates valid `-check.f` strings for all the test functions.
// enumerateTests enumerates valid `-check.f` strings for all the test functions.
// Note that we use regexp rather than parsing Go files for performance reason.
// (Try `TESTFLAGS=-check.list make test-integration-cli` to see the slowness of parsing)
// The files needs to be `gofmt`-ed
Expand Down
Loading

0 comments on commit 39bcaee

Please sign in to comment.