From 193cc7df1eec2150219a8af438c4e7181a8c12e0 Mon Sep 17 00:00:00 2001
From: Mike Sul <mike.sul@foundries.io>
Date: Wed, 18 Sep 2024 12:07:48 +0200
Subject: [PATCH] test: Use foundries' dind

Signed-off-by: Mike Sul <mike.sul@foundries.io>
---
 dev-shell.sh                    | 2 +-
 test/compose/docker-compose.yml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-shell.sh b/dev-shell.sh
index 45876cc..d479203 100755
--- a/dev-shell.sh
+++ b/dev-shell.sh
@@ -1,7 +1,7 @@
 down() {
     docker compose --env-file=test/compose/.env.test -f test/compose/docker-compose.yml down --remove-orphans
 	# remove the docker runtime part
-    docker volume rm compose_docker-runtime
+    docker volume rm compose_docker-runtime compose_reset-apps
 }
 
 trap down EXIT
diff --git a/test/compose/docker-compose.yml b/test/compose/docker-compose.yml
index 9289c7a..61c89d4 100644
--- a/test/compose/docker-compose.yml
+++ b/test/compose/docker-compose.yml
@@ -6,12 +6,13 @@ services:
       - ${REG_DIR}/config.yml:/etc/docker/registry/config.yml
 
   dockerd:
-    image: docker:25.0.3-dind-alpine3.19
+    image: ghcr.io/foundriesio/moby:25.0.3_fio
     command: ["dockerd", "-D", "-H", "unix:///var/run/docker/docker.sock"]
     privileged: true
     volumes:
       - docker-runtime:/var/run/docker
       - ${REG_DIR}/daemon.json:/etc/docker/daemon.json:ro
+      - reset-apps:/var/sota/reset-apps
 
   composectl:
     build:
@@ -24,6 +25,7 @@ services:
       - ${SRC_DIR}:${SRC_DIR}
       - ${BIN_DIR}:${SRC_DIR}/bin
       - docker-runtime:/var/run/docker
+      - reset-apps:/var/sota/reset-apps
     working_dir: ${SRC_DIR}
     depends_on:
       - registry
@@ -32,6 +34,8 @@ services:
       - DOCKER_HOST=unix:///var/run/docker/docker.sock
       - COMPOSECTL_EXE=${BIN_DIR}/composectl
       - SRC_DIR=${SRC_DIR}
+      - STOREROOT=/var/sota/reset-apps
 
 volumes:
   docker-runtime:
+  reset-apps: