From 11eb5c991603ff8af263a3bbeadfa528734241b3 Mon Sep 17 00:00:00 2001
From: Paul Pan <i@0x7f.app>
Date: Wed, 13 Mar 2024 22:17:00 +0800
Subject: [PATCH] fix: docker images

---
 Runner.Dockerfile  |  4 ++--
 docker-compose.yml | 18 ++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Runner.Dockerfile b/Runner.Dockerfile
index 362c560..9836ca4 100644
--- a/Runner.Dockerfile
+++ b/Runner.Dockerfile
@@ -31,5 +31,5 @@ COPY --from=rootfs-run  / /app/resource/runner/framework/rootfs/run
 # nsjail
 COPY --from=rootfs-full /woj/framework/scripts/nsjail /app/resource/runner/framework/scripts/nsjail
 
-# reap zombies from containerd-shim
-ENTRYPOINT ["/sbin/tini", "/app/docker-entrypoint.sh"]
+# reap zombies
+ENTRYPOINT ["/usr/bin/tini", "/app/docker-entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b46b7f..2d6ca3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,15 +18,11 @@ services:
       - STORAGE_BUCKET=woj
       - DEVELOPMENT=true
     volumes:
-      - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     depends_on:
-      storage:
-        condition: service_healthy
-      cache:
-        condition: service_healthy
-      db:
-        condition: service_healthy
+      - storage
+      - cache
+      - db
     ports:
       - "8000:8000"
 
@@ -47,13 +43,11 @@ services:
       - SETUP_CGROUP=true
     volumes:
       - runner:/app/resource/runner/user
-      - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     depends_on:
-      storage:
-        condition: service_healthy
-      cache:
-        condition: service_healthy
+      - storage
+      - cache
+      - db
 
   storage:
     image: quay.io/minio/minio:latest