From 11839063574250291a3050a771b8b791129ac1a9 Mon Sep 17 00:00:00 2001 From: mtojek Date: Tue, 6 Sep 2022 11:52:02 +0200 Subject: [PATCH 1/3] EPR: enable proxy mode --- internal/profile/_static/Dockerfile.package-registry | 7 ++++++- internal/profile/_static/package_registry.yml | 5 +---- internal/profile/static.go | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/internal/profile/_static/Dockerfile.package-registry b/internal/profile/_static/Dockerfile.package-registry index 2e4ebe4904..a38cb9aa61 100644 --- a/internal/profile/_static/Dockerfile.package-registry +++ b/internal/profile/_static/Dockerfile.package-registry @@ -1,5 +1,10 @@ FROM __BASE_IMAGE__ - ARG PROFILE + +# Disable package validation (already done). +ENV EPR_DISABLE_PACKAGE_VALIDATION=true + COPY profiles/${PROFILE}/stack/package-registry.config.yml /package-registry/config.yml COPY stack/development/ /packages/development + +ENTRYPOINT ["./package-registry", "--feature-proxy-mode", "--log-level", "debug"] \ No newline at end of file diff --git a/internal/profile/_static/package_registry.yml b/internal/profile/_static/package_registry.yml index ed56090f02..555fd8441e 100644 --- a/internal/profile/_static/package_registry.yml +++ b/internal/profile/_static/package_registry.yml @@ -1,5 +1,2 @@ package_paths: - - /packages/development - - /packages/production - - /packages/staging - - /packages/snapshot + - /packages/development \ No newline at end of file diff --git a/internal/profile/static.go b/internal/profile/static.go index 7a96499e64..896584d786 100644 --- a/internal/profile/static.go +++ b/internal/profile/static.go @@ -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)), @@ -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" // PackageRegistryDockerfileFile is the dockerfile for the Elastic package registry const PackageRegistryDockerfileFile configFile = "Dockerfile.package-registry" From 2dad2b19eef9f228653a0ef1642f677b52514ffa Mon Sep 17 00:00:00 2001 From: mtojek Date: Tue, 6 Sep 2022 14:35:02 +0200 Subject: [PATCH 2/3] Address PR comments --- internal/profile/_static/Dockerfile.package-registry | 2 +- internal/profile/_static/docker-compose-stack.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/profile/_static/Dockerfile.package-registry b/internal/profile/_static/Dockerfile.package-registry index a38cb9aa61..8f4da0d016 100644 --- a/internal/profile/_static/Dockerfile.package-registry +++ b/internal/profile/_static/Dockerfile.package-registry @@ -7,4 +7,4 @@ ENV EPR_DISABLE_PACKAGE_VALIDATION=true COPY profiles/${PROFILE}/stack/package-registry.config.yml /package-registry/config.yml COPY stack/development/ /packages/development -ENTRYPOINT ["./package-registry", "--feature-proxy-mode", "--log-level", "debug"] \ No newline at end of file +ENTRYPOINT ["./package-registry", "-feature-proxy-mode"] \ No newline at end of file diff --git a/internal/profile/_static/docker-compose-stack.yml b/internal/profile/_static/docker-compose-stack.yml index bb31a93cde..0f2b4930a7 100644 --- a/internal/profile/_static/docker-compose-stack.yml +++ b/internal/profile/_static/docker-compose-stack.yml @@ -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" From 7eb98da1ce18720325704903714eb8ef09797636 Mon Sep 17 00:00:00 2001 From: mtojek Date: Wed, 7 Sep 2022 09:58:11 +0200 Subject: [PATCH 3/3] Use ENV --- internal/profile/_static/Dockerfile.package-registry | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/profile/_static/Dockerfile.package-registry b/internal/profile/_static/Dockerfile.package-registry index 8f4da0d016..750aae85d4 100644 --- a/internal/profile/_static/Dockerfile.package-registry +++ b/internal/profile/_static/Dockerfile.package-registry @@ -4,7 +4,7 @@ ARG PROFILE # Disable package validation (already done). ENV EPR_DISABLE_PACKAGE_VALIDATION=true -COPY profiles/${PROFILE}/stack/package-registry.config.yml /package-registry/config.yml -COPY stack/development/ /packages/development +ENV EPR_FEATURE_PROXY_MODE=true -ENTRYPOINT ["./package-registry", "-feature-proxy-mode"] \ No newline at end of file +COPY profiles/${PROFILE}/stack/package-registry.config.yml /package-registry/config.yml +COPY stack/development/ /packages/development \ No newline at end of file