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

Add private registry support for Dockerfile image build #18760

Merged
merged 3 commits into from
Sep 26, 2023

Conversation

iQQBot
Copy link
Contributor

@iQQBot iQQBot commented Sep 20, 2023

Description

Add private registry support for Dockerfile image build

Summary generated by Copilot

🤖 Generated by Copilot at a1bfd46

This pull request adds support for ECR registries as mirrors for image building, by introducing changes to the proxy, auth, and orchestrator packages, and by using a custom buildkit image with a patched containerd. This feature allows users to specify ECR registries as sources for their workspace images, and improves the performance and reliability of image building.

Related Issue(s)

Fixes PRD-111

How to test

Documentation

Preview status

Gitpod was successfully deployed to your preview environment.

Build Options

Build
  • /werft with-werft
    Run the build with werft instead of GHA
  • leeway-no-cache
  • /werft no-test
    Run Leeway with --dont-test
Publish
  • /werft publish-to-npm
  • /werft publish-to-jb-marketplace
Installer
  • analytics=segment
  • with-dedicated-emulation
  • workspace-feature-flags
    Add desired feature flags to the end of the line above, space separated
Preview Environment / Integration Tests
  • /werft with-local-preview
    If enabled this will build install/preview
  • /werft with-preview
  • /werft with-large-vm
  • /werft with-gce-vm
    If enabled this will create the environment on GCE infra
  • with-integration-tests=all
    Valid options are all, workspace, webapp, ide, jetbrains, vscode, ssh. If enabled, with-preview and with-large-vm will be enabled.
  • with-monitoring

/hold

@iQQBot iQQBot force-pushed the pd/private-docker-mirror branch from 15183cd to 825aff2 Compare September 20, 2023 13:47
@iQQBot iQQBot changed the title [POC] DO NOT MERGE Added private registry support for Dockerfile image build Sep 21, 2023
@iQQBot iQQBot changed the title Added private registry support for Dockerfile image build Add private registry support for Dockerfile image build Sep 21, 2023
@iQQBot iQQBot marked this pull request as ready for review September 21, 2023 07:52
@iQQBot iQQBot requested a review from a team as a code owner September 21, 2023 07:52
Copy link
Member

@easyCZ easyCZ left a comment

Choose a reason for hiding this comment

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

Looks good. Do we have a way to extend the unit tests to show the logic exhibits the desired behaviour? If so, could you try to add them, please?

@iQQBot
Copy link
Contributor Author

iQQBot commented Sep 26, 2023

Looks good. Do we have a way to extend the unit tests to show the logic exhibits the desired behaviour? If so, could you try to add them, please?

I haven't found a suitable way to add unit tests, on one hand this requires a patched version for buildkitd and also a registry server, plus these are still dependent on the domain name for forwarding, which makes the whole thing very complicated, I'm leaning towards merging this PR for now, and if I have the time I may add unit tests in another PR.

@iQQBot
Copy link
Contributor Author

iQQBot commented Sep 26, 2023

/unhold

@roboquat roboquat merged commit e2b82f6 into main Sep 26, 2023
14 checks passed
@roboquat roboquat deleted the pd/private-docker-mirror branch September 26, 2023 09:55
@ChevronTango
Copy link

Does this PR make the work in #18604 redundant?

@corneliusludmann
Copy link
Contributor

Hey @ChevronTango! Indeed, it seems that your work is covered by this PR as well. Do you need any help to test whether it solves your use case?

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.

5 participants