Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kots] merge custom docker config correctly #14432

Merged
merged 1 commit into from
Nov 4, 2022
Merged

Conversation

Pothulapati
Copy link
Contributor

@Pothulapati Pothulapati commented Nov 4, 2022

Description

This PR fixes the issue when a custom docker config json file is uploaded by the user.

Signed-off-by: Tarun Pothulapati tarun@gitpod.io

Related Issue(s)

Fixes #14365

How to test

Release Notes

[kots] merge custom docker config correctly

Documentation

Werft options:

  • /werft with-local-preview
    If enabled this will build install/preview
  • /werft with-preview
  • /werft with-large-vm
  • /werft with-integration-tests=all
    Valid options are all, workspace, webapp, ide

This PR fixes the issue when a custom docker config
json file is uploaded by the user.

Signed-off-by: Tarun Pothulapati <tarun@gitpod.io>
@Pothulapati
Copy link
Contributor Author

Pothulapati commented Nov 4, 2022

/werft run no-preview publish-to-kots

👍 started the job as gitpod-build-tar-custom-docker-fix.1
(with .werft/ from main)

@Pothulapati
Copy link
Contributor Author

Pothulapati commented Nov 4, 2022

/werft run no-preview publish-to-kots

👍 started the job as gitpod-build-tar-custom-docker-fix.2
(with .werft/ from main)

@Pothulapati Pothulapati changed the title [kots] load custom docker config correctly [kots] merge custom docker config correctly Nov 4, 2022
@Pothulapati Pothulapati marked this pull request as ready for review November 4, 2022 12:24
@Pothulapati Pothulapati requested a review from a team November 4, 2022 12:24
@Pothulapati
Copy link
Contributor Author

Pothulapati commented Nov 4, 2022

/werft run no-preview

👍 started the job as gitpod-build-tar-custom-docker-fix.3
(with .werft/ from main)

@roboquat roboquat merged commit 3057dea into main Nov 4, 2022
@roboquat roboquat deleted the tar/custom-docker-fix branch November 4, 2022 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Attempting to Using 'Configure additional registry credentials' Causes Installer Pod to Fail
3 participants