Merge branch '7.17' into updatecli_updatecli-update-beats-7.17

elastic · Dec 22, 2023 · dcb800c · dcb800c
2 parents 808f11d + 02e1d9a
commit dcb800c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -70,7 +70,7 @@ if command -v docker &>/dev/null; then
     DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKER_REGISTRY_SECRET=$(retry 5 vault kv get -field registry "${DOCKER_REGISTRY_SECRET_PATH}")
-    docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY_SECRET}"
+    retry 4 docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY_SECRET}"
     unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET
     export DOCKER_REGISTRY_SECRET
     retry 4 docker pull --quiet docker.elastic.co/infra/release-manager:latest
@@ -80,7 +80,7 @@ if command -v docker &>/dev/null; then
     DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKERHUB_REGISTRY_SECRET=$(retry 5 vault kv get -field registry "${DOCKER_REGISTRY_SECRET_PATH}")
-    docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKERHUB_REGISTRY_SECRET}"
+    retry 4 docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKERHUB_REGISTRY_SECRET}"
     unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET
 fi
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       fleet-server: { condition: service_healthy }
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16-cf899701-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.17-13e2edc2-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -62,7 +62,7 @@ services:
       - "./testing/docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles"
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.17.16-cf899701-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:7.17.17-13e2edc2-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -86,7 +86,7 @@ services:
       package-registry: { condition: service_healthy }
 
   fleet-server:
-    image: docker.elastic.co/beats/elastic-agent:7.17.16-cf899701-SNAPSHOT
+    image: docker.elastic.co/beats/elastic-agent:7.17.17-13e2edc2-SNAPSHOT
     ports:
       - 8220:8220
     healthcheck:

diff --git a/packaging/ironbank/hardening_manifest.yaml.tmpl b/packaging/ironbank/hardening_manifest.yaml.tmpl
@@ -52,9 +52,6 @@ resources:
 
 # List of project maintainers
 maintainers:
-  - email: "[email protected]"
-    name: "Nassim Kammah"
-    username: "nassim.kammah"
   - email: "[email protected]"
     name: "Ivan Fernandez Calvo"
     username: "ivan.fernandez"