Skip to content

EPR: enable proxy mode #957

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 7, 2022
Merged

EPR: enable proxy mode #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1183906
EPR: enable proxy mode
Sep 6, 2022
2dad2b1
Address PR comments
Sep 6, 2022
7eb98da
Use ENV
Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions internal/profile/_static/Dockerfile.package-registry
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
FROM __BASE_IMAGE__

ARG PROFILE

# Disable package validation (already done).
ENV EPR_DISABLE_PACKAGE_VALIDATION=true

ENV EPR_FEATURE_PROXY_MODE=true

COPY profiles/${PROFILE}/stack/package-registry.config.yml /package-registry/config.yml
COPY stack/development/ /packages/development
COPY stack/development/ /packages/development
1 change: 1 addition & 0 deletions internal/profile/_static/docker-compose-stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ services:
retries: 300
interval: 1s
environment:
- "EPR_LOG_LEVEL=debug"
- "EPR_ADDRESS=0.0.0.0:8080"
- "EPR_METRICS_ADDRESS=0.0.0.0:9000"
- "EPR_TLS_KEY=/etc/ssl/package-registry/key.pem"
Expand Down
5 changes: 1 addition & 4 deletions internal/profile/_static/package_registry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
package_paths:
- /packages/development
- /packages/production
- /packages/staging
- /packages/snapshot
Copy link
Member

Choose a reason for hiding this comment

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

🔥 🔥 🔥

- /packages/development
4 changes: 2 additions & 2 deletions internal/profile/static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ var packageRegistryConfigYml string

// newPackageRegistryConfig returns a Managed Config
func newPackageRegistryConfig(_ string, profilePath string) (*simpleFile, error) {

return &simpleFile{
name: string(PackageRegistryConfigFile),
path: filepath.Join(profilePath, profileStackPath, string(PackageRegistryConfigFile)),
Expand All @@ -124,7 +123,8 @@ func newPackageRegistryConfig(_ string, profilePath string) (*simpleFile, error)
}

// PackageRegistryBaseImage is the base Docker image of the Elastic Package Registry.
const PackageRegistryBaseImage = "docker.elastic.co/package-registry/distribution:snapshot"
// commit SHA of enabled proxy mode (technical preview feature)
const PackageRegistryBaseImage = "docker.elastic.co/package-registry/package-registry:14455fcb7e415d6b4aed48e00d2289718f056162"
Copy link
Member

Choose a reason for hiding this comment

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

Do you want to wait to have a released version with this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, as I'm afraid that we may need to add more fixes, and going with the standard release will slow it down. I will replace it with a proper release after some time.


// PackageRegistryDockerfileFile is the dockerfile for the Elastic package registry
const PackageRegistryDockerfileFile configFile = "Dockerfile.package-registry"
Expand Down