diff --git a/cli/config/compose/profiles/fleet/default/kibana.config.yml b/cli/config/compose/profiles/fleet/default/kibana.config.yml index 6fb346118e..64840917d2 100644 --- a/cli/config/compose/profiles/fleet/default/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/default/kibana.config.yml @@ -9,7 +9,7 @@ elasticsearch.username: elastic elasticsearch.password: changeme xpack.monitoring.ui.container.elasticsearch.enabled: true -xpack.fleet.registryUrl: "http://package-registry:8080" +xpack.fleet.registryUrl: "https://epr-staging.elastic.co" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200" xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"] diff --git a/cli/config/compose/profiles/fleet/default/package-registry.config.yml b/cli/config/compose/profiles/fleet/default/package-registry.config.yml deleted file mode 100644 index ed56090f02..0000000000 --- a/cli/config/compose/profiles/fleet/default/package-registry.config.yml +++ /dev/null @@ -1,5 +0,0 @@ -package_paths: - - /packages/development - - /packages/production - - /packages/staging - - /packages/snapshot diff --git a/cli/config/compose/profiles/fleet/docker-compose.yml b/cli/config/compose/profiles/fleet/docker-compose.yml index 250bd58fa9..b87aace87a 100644 --- a/cli/config/compose/profiles/fleet/docker-compose.yml +++ b/cli/config/compose/profiles/fleet/docker-compose.yml @@ -54,11 +54,3 @@ services: - "KIBANA_FLEET_HOST=http://kibana:5601" - "FLEET_SERVER_HOST=0.0.0.0" - "FLEET_SERVER_PORT=8220" - package-registry: - image: docker.elastic.co/package-registry/distribution:staging - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080"] - retries: 300 - interval: 1s - volumes: - - ./${kibanaProfile:-default}/package-registry.config.yml:/package-registry/config.yml diff --git a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml index a995d47e26..dd2ff396c8 100644 --- a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml @@ -9,7 +9,7 @@ elasticsearch.username: elastic elasticsearch.password: changeme xpack.monitoring.ui.container.elasticsearch.enabled: true -xpack.fleet.registryUrl: "http://package-registry:8080" +xpack.fleet.registryUrl: "https://epr-staging.elastic.co" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200" xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"] diff --git a/cli/config/compose/profiles/fleet/preconfigured-policies/package-registry.config.yml b/cli/config/compose/profiles/fleet/preconfigured-policies/package-registry.config.yml deleted file mode 100644 index ed56090f02..0000000000 --- a/cli/config/compose/profiles/fleet/preconfigured-policies/package-registry.config.yml +++ /dev/null @@ -1,5 +0,0 @@ -package_paths: - - /packages/development - - /packages/production - - /packages/staging - - /packages/snapshot diff --git a/internal/deploy/elastic_package.go b/internal/deploy/elastic_package.go index 10e642f4a7..fb930eed56 100644 --- a/internal/deploy/elastic_package.go +++ b/internal/deploy/elastic_package.go @@ -132,7 +132,7 @@ func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error // Bootstrap sets up environment with docker compose func (ep *EPServiceManager) Bootstrap(ctx context.Context, profile ServiceRequest, env map[string]string, waitCB func() error) error { - services := "elasticsearch,fleet-server,kibana,package-registry" + services := "elasticsearch,fleet-server,kibana" version := common.StackVersion