Skip to content
This repository has been archived by the owner on Mar 21, 2022. It is now read-only.

Fix bug when duplicate registries are in docker config #1100

Merged
merged 1 commit into from
Oct 25, 2018
Merged

Conversation

davidxia
Copy link
Contributor

@codecov
Copy link

codecov bot commented Oct 25, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@ef22223). Click here to learn what that means.
The diff coverage is 87.5%.

@@            Coverage Diff            @@
##             master    #1100   +/-   ##
=========================================
  Coverage          ?   70.17%           
  Complexity        ?      791           
=========================================
  Files             ?      178           
  Lines             ?     3772           
  Branches          ?      393           
=========================================
  Hits              ?     2647           
  Misses            ?      960           
  Partials          ?      165

Copy link
Member

@mattnworb mattnworb left a comment

Choose a reason for hiding this comment

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

am I reading it right that the credHelpers has precedence? (that sounds like the logical thing to do)

@davidxia
Copy link
Contributor Author

@mattnworb yup, see the test here.

@davidxia
Copy link
Contributor Author

cc @spotify/docker-admins

@davidxia davidxia merged commit 8d19d0c into master Oct 25, 2018
@davidxia davidxia deleted the dxia/patch-1 branch October 25, 2018 18:53
davidxia added a commit to spotify/dockerfile-maven that referenced this pull request Oct 25, 2018
davidxia added a commit to spotify/dockerfile-maven that referenced this pull request Oct 25, 2018
cyrusv added a commit to cyrusv/common that referenced this pull request May 17, 2019
This version includes the following fixes from their changelog:
1.4.9 (released October 25 2018)
- Upgrade docker-client dep from 8.14.2 to 8.14.3 to fix spotify/docker-client#1100

1.4.8 (released October 23 2018)
- Upgrade docker-client dep from 8.14.0 to 8.14.2
- Upgrade com.sparkjava:spark-core to fix CVE-2018-9159
- Improve documentation on referencing build artifacts

Some of these fixes allow legal docker configs to build correctly,
which the current version throws errors on.
cyrusv added a commit to confluentinc/common that referenced this pull request May 20, 2019
This version includes the following fixes from their changelog:
1.4.9 (released October 25 2018)
- Upgrade docker-client dep from 8.14.2 to 8.14.3 to fix spotify/docker-client#1100

1.4.8 (released October 23 2018)
- Upgrade docker-client dep from 8.14.0 to 8.14.2
- Upgrade com.sparkjava:spark-core to fix CVE-2018-9159
- Improve documentation on referencing build artifacts

Some of these fixes allow legal docker configs to build correctly,
which the current version throws errors on.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Multiple entries with same key:" when overriding docker credentials
2 participants