From 5d65042467097cf0416e3010834562659115ddf9 Mon Sep 17 00:00:00 2001 From: ruflin Date: Thu, 2 Jul 2020 19:08:54 +0200 Subject: [PATCH 1/2] Attach the registry image to a specific version Builds in the integrations repo should not change over time. Also development in the registry should not directly affect the integrations repo. To have things more reproducible, this changes the docker container which is run for the registry to a specific revision. It is the same revision which is uesd for the golang dependencies. If possible, these two should stay in sync in the future. --- testing/environments/snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml index a96f2b13187..e7e97383bd4 100644 --- a/testing/environments/snapshot.yml +++ b/testing/environments/snapshot.yml @@ -38,7 +38,7 @@ services: - "127.0.0.1:5601:5601" package-registry: - image: docker.elastic.co/package-registry/package-registry:master + image: docker.elastic.co/package-registry/package-registry:41c150c8020efc53ab16e3bba774c62a419b51ea healthcheck: test: ["CMD", "curl", "-f", "http://127.0.0.1:8080"] retries: 300 From a39a3d4bca10ff38bf04e3da3f5cd87c0c90265d Mon Sep 17 00:00:00 2001 From: ruflin Date: Fri, 3 Jul 2020 08:39:17 +0200 Subject: [PATCH 2/2] also update CI and k8s --- .ci/integrations/Dockerfile | 2 +- testing/environments/kubernetes/snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/integrations/Dockerfile b/.ci/integrations/Dockerfile index b97560cc3ce..b97dd516850 100644 --- a/.ci/integrations/Dockerfile +++ b/.ci/integrations/Dockerfile @@ -1,3 +1,3 @@ -FROM docker.elastic.co/package-registry/package-registry:master +FROM docker.elastic.co/package-registry/package-registry:41c150c8020efc53ab16e3bba774c62a419b51ea COPY build/integrations /registry/packages/integrations \ No newline at end of file diff --git a/testing/environments/kubernetes/snapshot.yml b/testing/environments/kubernetes/snapshot.yml index 59d6a80496a..c8cb29825af 100644 --- a/testing/environments/kubernetes/snapshot.yml +++ b/testing/environments/kubernetes/snapshot.yml @@ -184,7 +184,7 @@ spec: name: registry-yaml-storage containers: - name: registry-ingest-management - image: docker.elastic.co/package-registry/package-registry:master + image: docker.elastic.co/package-registry/package-registry:41c150c8020efc53ab16e3bba774c62a419b51ea resources: limits: cpu: 1000m