.github/workflows/container.yml

@@ -4,7 +4,7 @@ jobs:
   image:
     runs-on: ubuntu-latest
     steps:
-      - name: Maximize Build Space
+      - name: Maximize build space
         run: |
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf /usr/local/lib/android

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
-ENTRYPOINT ["/usr/bin/tini", "/app/docker-entrypoint.sh"]
+# reap zombies from containerd-shim
+ENTRYPOINT ["/sbin/tini", "/app/docker-entrypoint.sh"]

build_image.sh

@@ -32,6 +32,8 @@ function docker_push() {
 function build_rootfs() {
     log_info "[+] Building Rootfs Images"
     pushd resource/runner || exit 1
+    docker_pull  "debian-full"
+    docker_pull  "debian-run"
     docker_build "debian-full" "scripts/debian-full.Dockerfile"
     docker_build "debian-run"  "scripts/debian-run.Dockerfile"
     popd || exit 1
@@ -45,16 +47,19 @@ function push_rootfs() {
 
 function build_base() {
     log_info "[+] Building Base"
+    docker_pull  "woj-server-base"
     docker_build "woj-server-base" "Base.Dockerfile"
 }
 
 function build_server() {
     log_info "[+] Building Server"
+    docker_pull  "woj-server"
     docker_build "woj-server" "Server.Dockerfile"
 }
 
 function build_runner() {
     log_info "[+] Building Runner"
+    docker_pull  "woj-runner"
     docker_build "woj-runner" "Runner.Dockerfile"
 }
 

docker-compose.yml

@@ -18,11 +18,15 @@ services:
       - STORAGE_BUCKET=woj
       - DEVELOPMENT=true
     volumes:
+      - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     depends_on:
-      - storage
-      - cache
-      - db
+      storage:
+        condition: service_healthy
+      cache:
+        condition: service_healthy
+      db:
+        condition: service_healthy
     ports:
       - "8000:8000"
 
@@ -43,11 +47,13 @@ services:
       - SETUP_CGROUP=true
     volumes:
       - runner:/app/resource/runner/user
+      - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     depends_on:
-      - storage
-      - cache
-      - db
+      storage:
+        condition: service_healthy
+      cache:
+        condition: service_healthy
 
   storage:
     image: quay.io/minio/minio:latest