As 'env_file' entries are not taken in account, we warn the user to copy that and fix it's compose file.

- What I did Add a warning for each env_file entry on each service

- How I did it By checking the env_file block for each service entry in docker app init

- How to verify it Create a docker-compose.yml file with:

version: '3.7'
services:
  front:
    image: "nginx"
    env_file:
     - "myenv.env1"
     - "myenv.env2"

Run:

docker app init --compose-file docker-compose.yml myapp

- Description for the changelog Add warnings for env_file entries not copied

- A picture of a cute animal (not mandatory but encouraged)

I think we've actually implemented this in the time since you opened this PR @thaJeztah :) Thanks for the suggestion!

I'll close this and we'll open other issues if we find places we forgot to do this.

Quick 5-minute write-up;

This should likely not make a difference for most situations, but try to keep a single source of truth where to print output

There's still some occurences of os.Stdout to detect if a terminal is attached, so perhaps we need a central solution for that

<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/docker/app/blob/master/CONTRIBUTING.md

** Make sure all your commits include a signature generated with git commit -s **

For additional information on our contributing process, read our contributing guide https://docs.docker.com/opensource/code/

If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx"

Please provide the following information: -->

- What I did Download the CLI for macOS and Linux as they are available on download.docker.com. This should make the build slightly faster.

Note the CLI is only used for testing – we do not ship it.

- How I did it Replace build with curl.

- How to verify it Existing tests should pass.

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> N/A

- A picture of a cute animal (not mandatory)

Hi @Greek64,

We see the Compose format as a way of modelling container based applications and use it not only for docker-compose but also for Swarm and Kubernetes (with docker stack deploy). As such, I don't think that a service level log colour in the format makes sense as other orchestrators wouldn't use it.

We could consider a docker-compose specific label or something though. What use case is not solved by the colours being deterministic as they are with #6996?

- WIP Need to get an e2e or unit test that covers the digest.

- What I did

Reworked the image ls output to better match the docker image ls command. The output now has separate columns for REPOSITORY and TAG as well as an APP IMAGE ID column.

Added the --digests flag to image ls. This makes the image ls command print the image digests (if present) along with the other columns.

- How I did it

Made the columns list for image ls dynamic depending on what options are sent. The digest is retrieved by attempted to cast to a Digested type (i.e. the image has been stored by digest rather than by tag or ID). If not then just prints <none>.

- How to verify it

Pull an image from hub by digest and then run app image ls --digest. The image in question should show the digest prefixed by the algorithm type. E.g.

REPOSITORY   TAG    DIGEST          APP IMAGE ID APP NAME
<repository> <none> sha256@<digest> <id>         <name>

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Added the --digests flag to the app image ls command. When present, the command will print the image's digest or <none> if the image does not have a digest, along with other image details.

- A picture of a cute animal (not mandatory but encouraged)

Do we want to update the app tabwriter so the spacing match the CLI?

Yes. That will make the feel the same.

Probably best do the others as part of a separate PR though

👍 Please just create a ticket to track

Is the spacing between the columns the same as for container images? From the following, It looks to me like app has less spaces.

➜  app git:(add-digest-flag-to-ls) docker app image ls
REPOSITORY       TAG  APP IMAGE ID APP NAME
ccrone/cnab-demo yves 6cca8f6428a9 coins
ccrone/cnab-demo yves 6cca8f6428a9 coins
➜  app git:(add-digest-flag-to-ls) docker images
REPOSITORY             TAG                           IMAGE ID            CREATED             SIZE
docker/cnab-app-base   v0.9.0-zeta1-66-g24ced43b0d   f5d2426e6a7f        2 minutes ago       47.7MB
ccrone/cnab-demo       <none>                        51a16e185d83        59 minutes ago      47.2MB
ccrone/cnab-demo       <none>                        7cc9617f5c36        About an hour ago   218MB
ccrone/cnab-demo       <none>                        de25a81a5a0b        2 weeks ago         98.2MB

nit: \n

nit: \n

nit: why not 19.03?

I would argue that fields and changes made in docker/cli should override those in docker/compose for 3.x formats.

I would agree on this. We have an internal ticket tracking this, we just haven't prioritised it yet. I'll chat to our PM and see when we can fit it in.

Same question for line 56 and 63

nit: don't need back quotes here.

nit: is there a reason we use single quotes here but double quote elsewhere?

Looking further down, it appears this was the case from before

nit: don't need back quotes here.

I still need to add a readme for this so will leave it in draft until that's done.

- What I did Added an example of a Docker App that has service images that can be built.

- Description for the changelog N/A

This PR is included in the 1.25.0-rc3 release that you can find here. It will also be part of the next Docker Desktop edge release.

- What I did Activated BuildKit for the CI.

- How I did it Set DOCKER_BUILDKIT=1 in the Jenkinsfiles.

- How to verify it

- Description for the changelog N/A

- A picture of a cute animal (not mandatory but encouraged)

- What I did Activated BuildKit for the CI.

- How I did it Set DOCKER_BUILDKIT=1 in the Jenkinsfiles.

- How to verify it

- Description for the changelog N/A

- A picture of a cute animal (not mandatory but encouraged)

I think this is because we don't use BuildKit on the CI

nit: which is quicker lint or spell check? I'd put the quicker one first so that we can fail faster

- What I did Leveraged docker build --output to get artefacts from images. This means that we can avoid doing docker build && docker container create && docker cp && docker rm.

- How I did it

- How to verify it Existing tests should all pass.

- Description for the changelog N/A

- A picture of a cute animal (not mandatory but encouraged)

s/on/about/

Does /dev/stdout work on Windows?

s/where/in which/

@silvin-lubecki does render work from definitions as well as images?

nit: we could make the SHA prefix something like c0de instead of beef given that we're making developer tools

Do we want to capitalise Running and Image?

Note that image is not capitalised in the CLI:

$ docker image help

Usage:	docker image COMMAND

Manage images

Signed-off-by: Christopher Crone [email protected]

<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/docker/app/blob/master/CONTRIBUTING.md

** Make sure all your commits include a signature generated with git commit -s **

For additional information on our contributing process, read our contributing guide https://docs.docker.com/opensource/code/

If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx"

Please provide the following information: -->

- What I did As the YAML library bump is now in the 19.03 branch for the CLI, I've moved our vendoring back to use that.

- How I did it

• Update Gopkg.toml
• Run make vendor

- How to verify it

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: -->

- A picture of a cute animal (not mandatory but encouraged)

We can bump this later

Although the Dockerfile defaults to Python 3.7.4, the build-debian stage installs python2.7-dev - is that correct? https://github.com/docker/compose/blob/79f29dd/Dockerfile#L43

Not sure about this, @ulyssessouza can answer when he's back

The Dockerfile still has a FIXME, and pins to (older?) versions of virtualenv and tox. What's the easiest way to find out if those issues have been resolved? Will there be an error when updating to later versions, or does the breaking stuff happen "silently"? https://github.com/docker/compose/blob/79f29dd/Dockerfile#L51-L53

The issue was that it broke the macOS build in a way that was not obvious. I haven't tried newer versions recently to see if this is fixed. virtualenv and tox are used for testing and build purposes so we're not shipping them.

- What I did

Renamed the upgrade command to update

- How to verify it

Run docker app --help

- A picture of a cute animal (not mandatory but encouraged)

<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/docker/cli/blob/master/CONTRIBUTING.md

** Make sure all your commits include a signature generated with git commit -s **

For additional information on our contributing process, read our contributing guide https://docs.docker.com/opensource/code/

If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx"

Please provide the following information: -->

- What I did Bumped Compose on Kubernetes

- How I did it

• Updated vendor.conf
• Added k8s.io dependencies
• vndr

- How to verify it

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: -->

- A picture of a cute animal (not mandatory but encouraged)

I think you'll need to add this to setup.py too so that it's included when people do a pip install

It appears that while all other requests to the Compose API Server use JSON, delete collection (which is called as part of delete namespace) always uses protobuf – even if we register the API Server as only having JSON and YAML support. I think this is a Kubernetes 1.16 bug and we are looking for a work around.

Note to reviewer: This change was based on this: https://github.com/kubernetes/kubernetes/pull/76270

Note to reviewer that this change was needed

Additional information:

• Removed bitbucket.org/ww/goautoneg as it is now included in Prometheus
• Changed serializer.DirectCodecFactory to serializer.WithoutConversionCodecFactory in api/client/clientset/typed/compose/*/compose_client.go
• Moved grpc to v1.23.1
• Ran dep ensure -update sigs.k8s.io/structured-merge-diff
• Ran dep ensure -update k8s.io/utils

I would say: "%s.env_file %q will not be copied into %s.dockerapp. Please copy it manually and udpate the path accordingly in the compose file.", svcName, appName, envFilePath

s/compose/Compose/

s/compose/Compose/

Bumps github.com/xeipuuv/gojsonschema from 93e72a773fade158921402d6a24c819b48aba29d to 1.1.0. This release includes the previously tagged commit. <details> <summary>Release notes</summary>

Sourced from github.com/xeipuuv/gojsonschema's releases.

v1.1.0

• Adds the ability to explicitly use draft-04, draft-06 and draft-07 modes. #219
• Improved error messages for "uniqueItems". #220
• Fix rounding issues with "multipleOf". #223 </details> <details> <summary>Commits</summary>

• f971f3c Replace big.Float by big.Rat
• cdd33d0 Update documentation and add draft crossreference test
• 7cd9691 Add an extra test for schema detection and fix some bugs
• e8d857c Add support for custom metaschemas using $schema
• 42c3b50 Disable certain features if a specific draft is used
• c813aa8 Handle (exclusive)minimum/maximum with different drafts
• daa7675 Fully integrate draft version detection
• 2f08306 First work to implement draft differentiation
• ac52e68 Add indexes not unique array items to error details
• f3a9dae Removed if statement in result.go
• Additional commits viewable in compare view </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Note: This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking Bump now in your Dependabot dashboard.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
• @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

• Update frequency (including time of day and day of week)
• Pull request limits (per update run and/or open at any time)
• Out-of-range updates (receive only lockfile updates, if desired)
• Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Bumps github.com/evanphx/json-patch from 5858425f75500d40c52783dce87d085a483ce135 to 4.5.0. This release includes the previously tagged commit. <details> <summary>Release notes</summary>

Sourced from github.com/evanphx/json-patch's releases.

Improve Errors

This release improves the errors returned by using github.com/pkg/errors to allow for better error taxonomy detection. </details> <details> <summary>Commits</summary>

• 026c730 Cleanup errors to help understand what failed. Fixes #75
• aad5688 Merge pull request #79 from sbward/master
• 72d00a9 Revert govet fixes
• 250db64 Update error messages
• 9d7a8df Expose Operation and methods, fix lint errors
• See full diff in compare view </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Note: This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking Bump now in your Dependabot dashboard.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
• @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

• Update frequency (including time of day and day of week)
• Pull request limits (per update run and/or open at any time)
• Out-of-range updates (receive only lockfile updates, if desired)
• Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Bumps github.com/onsi/ginkgo from e51bee6 to 5049dc5. <details> <summary>Commits</summary>

• 5049dc5 speed up table entry generateIt() (#609)
• 7bb3091 Fix. Write errors to stderr instead of stdout (#610)
• 974566c v1.10.1
• 2a4c0bd stack backtrace: fix skipping (#600)
• f90f37d v1.10.0
• 66915d6 stack backtrace: fix alignment and skipping
• 8f97b93 fix typo in documentation
• 7e8b50d v1.9.0
• 0ecbc58 Fixed typos in comments
• a7f8bfb gofmt code
• Additional commits viewable in compare view </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Note: This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking Bump now in your Dependabot dashboard.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
• @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

• Update frequency (including time of day and day of week)
• Pull request limits (per update run and/or open at any time)
• Out-of-range updates (receive only lockfile updates, if desired)
• Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Bumps github.com/Masterminds/semver from 1.4.2 to 3.0.1. <details> <summary>Release notes</summary>

Sourced from github.com/Masterminds/semver's releases.

3.0.1

#125: Fixes issue with module path for v3

v3.0.0

This is a major release of the semver package which includes API changes. The Go API is compatible with ^1. The Go API was not changed because many people are using go get without Go modules for their applications and API breaking changes cause errors which we have or would need to support.

The changes in this release are the handling based on the data passed into the functions. These are described in the added and changed sections below.

Added

• StrictNewVersion function. This is similar to NewVersion but will return an error if the version passed in is not a strict semantic version. For example, 1.2.3 would pass but v1.2.3 or 1.2 would fail because they are not strictly speaking semantic versions. This function is faster, performs fewer operations, and uses fewer allocations than NewVersion.
• Fuzzing has been performed on NewVersion, StrictNewVersion, and NewConstraint. The Makefile contains the operations used. For more information on you can start on Wikipedia at https://en.wikipedia.org/wiki/Fuzzing
• Now using Go modules

Changed

• NewVersion has proper prerelease and metadata validation with error messages to signal an issue with either of them
• Handles space separated AND conditions in addition to ,
• ^ now operates using a similar set of rules to npm/js and Rust/Cargo. If the version is >=1 the ^ ranges works the same as v1. For major versions of 0 the rules have changed. The minor version is treated as the stable version unless a patch is specified and then it is equivalent to =. One difference from npm/js is that prereleases there are only to a specific version (e.g. 1.2.3). Prereleases here look over multiple versions and follow semantic version ordering rules. This pattern now follows along with the expected and requested handling of this packaged by numerous users.

Release 1.5.0

Added

• #103: Add basic fuzzing for NewVersion() (thanks @​jesse-c)

Changed

• #82: Clarify wildcard meaning in range constraints and update tests for it (thanks @​greysteil)
• #83: Clarify caret operator range for pre-1.0.0 dependencies (thanks @​greysteil)
• #72: Adding docs comment pointing to vert for a cli
• #71: Update the docs on pre-release comparator handling
• #89: Test with new go versions (thanks @​thedevsaddam) </tr></table> ... (truncated) </details> <details> <summary>Changelog</summary>

Sourced from github.com/Masterminds/semver's changelog.

3.0.1 (2019-09-13)

Fixed

• #125: Fixes issue with module path for v3

3.0.0 (2019-09-12)

This is a major release of the semver package which includes API changes. The Go API is compatible with ^1. The Go API was not changed because many people are using go get without Go modules for their applications and API breaking changes cause errors which we have or would need to support.

The changes in this release are the handling based on the data passed into the functions. These are described in the added and changed sections below.

Added

• StrictNewVersion function. This is similar to NewVersion but will return an error if the version passed in is not a strict semantic version. For example, 1.2.3 would pass but v1.2.3 or 1.2 would fail because they are not strictly speaking semantic versions. This function is faster, performs fewer operations, and uses fewer allocations than NewVersion.
• Fuzzing has been performed on NewVersion, StrictNewVersion, and NewConstraint. The Makefile contains the operations used. For more information on you can start on Wikipedia at https://en.wikipedia.org/wiki/Fuzzing
• Now using Go modules

Changed

• NewVersion has proper prerelease and metadata validation with error messages to signal an issue with either of them
• ^ now operates using a similar set of rules to npm/js and Rust/Cargo. If the version is >=1 the ^ ranges works the same as v1. For major versions of 0 the rules have changed. The minor version is treated as the stable version unless a patch is specified and then it is equivalent to =. One difference from npm/js is that prereleases there are only to a specific version (e.g. 1.2.3). Prereleases here look over multiple versions and follow semantic version ordering rules. This pattern now follows along with the expected and requested handling of this packaged by numerous users.

1.5.0 (2019-09-11)

Added

• #103: Add basic fuzzing for NewVersion() (thanks @​jesse-c)

Changed

• #82: Clarify wildcard meaning in range constraints and update tests for it (thanks @​greysteil) </tr></table> ... (truncated) </details> <details> <summary>Commits</summary>

• fe7c210 Merge pull request #126 from mattfarina/modfix
• 7e17568 Fixes issue with module path for v3
• 0337c9b Merge pull request #124 from mattfarina/v3-rel-notes
• be888df Updating the docs for the 3.0.0 release
• 4492473 Merge pull request #121 from mattfarina/fuzzing
• b01f0c4 Adding fuzzing for v3
• 3c3e3c7 Merge pull request #123 from mattfarina/changelog-update3
• c4400c9 Updating changelog for 1.5.0 release
• 0873dd6 Merge pull request #120 from mattfarina/fix-119
• 6d097ca Handling ^ correctly with additional tests
• Additional commits viewable in compare view </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Note: This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking Bump now in your Dependabot dashboard.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
• @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

• Update frequency (including time of day and day of week)
• Pull request limits (per update run and/or open at any time)
• Out-of-range updates (receive only lockfile updates, if desired)
• Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Bumps github.com/stretchr/testify from 1.2.2 to 1.4.0. <details> <summary>Release notes</summary>

Sourced from github.com/stretchr/testify's releases.

v1.4.0

The 1.4.0 release includes new matchers and bug fixes. See the v.1.4.0 milestone for a complete list of closed issues associated with this release.

v1.3.0

Pull requests included in this release:

• stretchr/testify#678 - Fixed incorrect comment
• stretchr/testify#661 - Allow assert.Equal on string type alias without panicking on failure
• stretchr/testify#659 - Add Go1.11 to CI
• stretchr/testify#682 - update comment to match function name
• stretchr/testify#688 - Bump Go versions and use '.x' to always get latest minor versions
• stretchr/testify#648 - Update the LICENSE to match the 'standard' MIT license file
• stretchr/testify#699 - Support arbitrary objects as the sole element in msgAndArgs
• stretchr/testify#696 - Recover panic in suite
• stretchr/testify#655 - Add support for subtests (go 1.7)
• stretchr/testify#607 - Add go.mod and go.modverify
• stretchr/testify#670 - Fix typo ("PASS" -> "FAIL")
• stretchr/testify#712 - Preserve stack frame for mock parent method call
• stretchr/testify#707 - fix for comparing kinds
• stretchr/testify#697 - Update readme to deprecate http and include available packages </details> <details> <summary>Commits</summary>

• 221dbe5 fix mutex
• 1bb3d5a improve find expected call
• 555ebd3 Fix panic for equality assertions for values of aliased string type
• 0224ef2 Add YAMLEq to assert that two YAML strings are equivalent
• d84e815 Introduce Eventually assertion.
• ae5876d change report wording, fix int stringification, fix doc
• 34c6fa2 assert, require: Regenerate
• 21cb1c2 add ptr comparison func 'Same' to assert pkg
• 10a9f47 Show stack trace on panic
• 3f658bd add comparison
• Additional commits viewable in compare view </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Note: This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking Bump now in your Dependabot dashboard.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
• @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

• Update frequency (including time of day and day of week)
• Pull request limits (per update run and/or open at any time)
• Out-of-range updates (receive only lockfile updates, if desired)
• Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Bumps github.com/mitchellh/go-homedir from 3864e76 to af06845. <details> <summary>Commits</summary>

• af06845 Add a Reset function
• ae18d6b Add go.mod and release v1
• 5804607 Fix formatting
• d26f376 Merge pull request #24 from mbrancato/master
• 32e698a Shift up the preference of the USERPROFILE variable
• See full diff in compare view </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Note: This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking Bump now in your Dependabot dashboard.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
• @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

• Update frequency (including time of day and day of week)
• Pull request limits (per update run and/or open at any time)
• Out-of-range updates (receive only lockfile updates, if desired)
• Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Bumps github.com/onsi/gomega from 9be8410 to bdebf9e. <details> <summary>Commits</summary>

• bdebf9e v1.7.0
• 642e5ba export format property variables (#347)
• beea727 minor fix in the documentation of ExpectWithOffset (#358)
• 27d50ea v1.6.0
• cc1a6cb Remove duplication in XML matcher tests
• 7bf756a Remove unnecessary conversions (#357)
• 2e3b965 Fixed import order (#353)
• c98d3eb Added missing error handling in test (#355)
• 0001ed9 Simplify code (#356)
• 0d9100e Simplify code (#354)
• Additional commits viewable in compare view </details> <br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Note: This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking Bump now in your Dependabot dashboard.

<details> <summary>Dependabot commands and options</summary> <br />

You can trigger Dependabot actions by commenting on this PR:

• @dependabot rebase will rebase this PR
• @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
• @dependabot merge will merge this PR after your CI passes on it
• @dependabot squash and merge will squash and merge this PR after your CI passes on it
• @dependabot cancel merge will cancel a previously requested merge and block automerging
• @dependabot reopen will reopen this PR if it is closed
• @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
• @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
• @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
• @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
• @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
• @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
• @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
• @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

• Update frequency (including time of day and day of week)
• Pull request limits (per update run and/or open at any time)
• Out-of-range updates (receive only lockfile updates, if desired)
• Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

The kind versions that I had specified don't exist but are only part of the master/tag CI pipeline so I didn't catch it. This should fix the CI.

Hmm.. This is supposed to be updated by a web hook. It says that it fired correctly so I'm not sure why the docs weren't updated. I've re-delivered the web hook payload and will watch to see if it updates the docs.

@silvin-lubecki is there a way to force the verbose Compose JSON format? I'm worried that if we use short or long format it will be difficult for people to consume.

Backport of #2060

This avoids having redundant output when rendering the compose file once again by adding an option to remove the env_file from the config when already resolved.

undefined: loader.WithDiscardEnvFiles docker/cli@821f5ec not yet in 19.03

@thaJeztah are there plans to add that to 19.03?

The change is actually that they dropped the apps/v1beta2 endpoint. The apps/v1 endpoint has been around since Kubernetes 1.9, see this article. As such, we just need to change which endpoint we're calling and don't need to change the Kubernetes client.

Signed-off-by: Christopher Crone [email protected]

<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/docker/app/blob/master/CONTRIBUTING.md

** Make sure all your commits include a signature generated with git commit -s **

For additional information on our contributing process, read our contributing guide https://docs.docker.com/opensource/code/

If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx"

Please provide the following information: -->

- What I did As the YAML library bump is now in the 19.03 branch for the CLI, I've moved our vendoring back to use that.

- How I did it

• Update Gopkg.toml
• Run make vendor

- How to verify it

- Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: -->

- A picture of a cute animal (not mandatory but encouraged)

Moved vendoring back to 19.03.