feat: move search sidecar to its own docker image

GitOrigin-RevId: 546f5823d047ac303add541e842791d63e14f9c3

Author: alnr

quickstart-cockroach.yml

@@ -13,6 +13,9 @@ services:
   hydra-migrate:
     environment:
       - DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
+    depends_on:
+      "cockroachd":
+        condition: service_healthy
   hydra:
     environment:
       - DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
@@ -23,3 +26,12 @@ services:
     command: start-single-node --insecure
     networks:
       - intranet
+    volumes:
+      - cockroach-data:/cockroach/cockroach-data:rw
+    healthcheck:
+      test: ["CMD", "cockroach", "node", "status", "--insecure"]
+      interval: 1s
+      timeout: 30s
+      retries: 30
+volumes:
+  cockroach-data:

quickstart-mysql.yml

@@ -13,6 +13,9 @@ services:
   hydra-migrate:
     environment:
       - DSN=mysql://root:secret@tcp(mysqld:3306)/mysql?max_conns=20&max_idle_conns=4
+    depends_on:
+      "mysqld":
+        condition: service_healthy
   hydra:
     environment:
       - DSN=mysql://root:secret@tcp(mysqld:3306)/mysql?max_conns=20&max_idle_conns=4
@@ -24,3 +27,18 @@ services:
       - MYSQL_ROOT_PASSWORD=secret
     networks:
       - intranet
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "--user=root",
+          "--protocol=tcp",
+          "--password=secret",
+        ]
+      interval: 1s
+      timeout: 30s
+      retries: 30

quickstart-postgres.yml

@@ -13,14 +13,23 @@ services:
   hydra-migrate:
     environment:
       - DSN=postgres://hydra:secret@postgresd:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
+    depends_on:
+      "postgresd":
+        condition: service_healthy
   hydra:
     environment:
       - DSN=postgres://hydra:secret@postgresd:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
   postgresd:
     image: postgres:16
     ports:
       - "5432:5432"
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "hydra"]
+      interval: 1s
+      timeout: 30s
+      retries: 30
     environment:
+      - PGUSER=hydra
       - POSTGRES_USER=hydra
       - POSTGRES_PASSWORD=secret
       - POSTGRES_DB=hydra

quickstart.yml

@@ -15,6 +15,7 @@ services:
     volumes:
       - hydra-sqlite:/mnt/sqlite
     command: "chmod -R 777 /mnt/sqlite"
+
   hydra:
     # image: oryd/hydra:v25.4.0
     build:
@@ -35,8 +36,8 @@ services:
       - DSN=sqlite:///mnt/sqlite/db.sqlite?_fk=true&mode=rwc
     restart: unless-stopped
     depends_on:
-      - hydra-migrate
-      - sqlite
+      hydra-migrate:
+        condition: service_completed_successfully
     networks:
       - intranet
   hydra-migrate:
@@ -57,7 +58,8 @@ services:
     networks:
       - intranet
     depends_on:
-      - sqlite
+      sqlite:
+        condition: service_completed_successfully
   consent:
     environment:
       - HYDRA_ADMIN_URL=http://hydra:4445

test/conformance/docker-compose.yml

@@ -1,15 +1,15 @@
-version: "3.7"
-
 services:
   hydra-migrate:
+    image: hydra-migrate:head
     build:
-      # When running with `run.sh` the cwd is the project's root.
+      # When running with `start.sh` the cwd is the project's root.
       context: .
       dockerfile: ./test/conformance/hydra/Dockerfile
 
   hydra:
+    image: hydra-serve:head
     build:
-      # When running with `run.sh` the cwd is the project's root.
+      # When running with `start.sh` the cwd is the project's root.
       context: .
       dockerfile: ./test/conformance/hydra/Dockerfile
     environment:
@@ -34,7 +34,7 @@ services:
   httpd:
     image: oryd/hydra-oidc-httpd:latest
     #    build:
-    #      # When running with `run.sh` the cwd is the project's root.
+    #      # When running with `start.sh` the cwd is the project's root.
     #      context: ./test/conformance
     #      dockerfile: httpd/Dockerfile
     ports:
@@ -48,7 +48,7 @@ services:
   server:
     image: oryd/hydra-oidc-server:latest
     #    build:
-    #      # When running with `run.sh` the cwd is the project's root.
+    #      # When running with `start.sh` the cwd is the project's root.
     #      context: ./test/conformance
     #      dockerfile: Dockerfile
     depends_on:

test/conformance/start.sh

@@ -5,5 +5,3 @@ cd "$( dirname "${BASH_SOURCE[0]}" )/../.."
 
 # shellcheck disable=SC2086
 docker compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml up ${1:-} -d --force-recreate --build
-docker ps -a
-docker images

test/e2e/docker-compose.cockroach.yml

@@ -7,10 +7,14 @@ services:
       - DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
     command: migrate sql up -e --yes
     restart: on-failure
+    depends_on:
+      "cockroachd":
+        condition: service_healthy
 
   hydra:
     depends_on:
-      - hydra-migrate
+      hydra-migrate:
+        condition: service_completed_successfully
     environment:
       - DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
 
@@ -19,3 +23,12 @@ services:
     ports:
       - "26257:26257"
     command: start-single-node --insecure
+    volumes:
+      - cockroach-data:/cockroach/cockroach-data:rw
+    healthcheck:
+      test: ["CMD", "cockroach", "node", "status", "--insecure"]
+      interval: 1s
+      timeout: 30s
+      retries: 30
+volumes:
+  cockroach-data:

test/e2e/docker-compose.mysql.yml

@@ -7,10 +7,14 @@ services:
       - DSN=mysql://root:secret@tcp(mysqld:3306)/mysql?max_conns=20&max_idle_conns=4
     command: migrate sql up -e --yes
     restart: on-failure
+    depends_on:
+      "mysqld":
+        condition: service_healthy
 
   hydra:
     depends_on:
-      - hydra-migrate
+      hydra-migrate:
+        condition: service_completed_successfully
     environment:
       - DSN=mysql://root:secret@tcp(mysqld:3306)/mysql?max_conns=20&max_idle_conns=4
 
@@ -20,3 +24,18 @@ services:
       - "3306:3306"
     environment:
       - MYSQL_ROOT_PASSWORD=secret
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "--user=root",
+          "--protocol=tcp",
+          "--password=secret",
+        ]
+      interval: 1s
+      timeout: 30s
+      retries: 30

test/e2e/docker-compose.postgres.yml

@@ -7,18 +7,28 @@ services:
       - DSN=postgres://hydra:secret@postgresd:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
     command: migrate sql up -e --yes
     restart: on-failure
+    depends_on:
+      "postgresd":
+        condition: service_healthy
 
   hydra:
     depends_on:
-      - hydra-migrate
+      hydra-migrate:
+        condition: service_completed_successfully
     environment:
       - DSN=postgres://hydra:secret@postgresd:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4
 
   postgresd:
     image: postgres:11.8
     ports:
       - "5432:5432"
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "hydra"]
+      interval: 1s
+      timeout: 30s
+      retries: 30
     environment:
+      - PGUSER=hydra
       - POSTGRES_USER=hydra
       - POSTGRES_PASSWORD=secret
       - POSTGRES_DB=hydra