From 67b9e917c9a97c0892902a05e9d9021e75041545 Mon Sep 17 00:00:00 2001
From: Ali AKCA <ali@akca.io>
Date: Tue, 14 Nov 2023 11:57:18 +0100
Subject: [PATCH] feat: add dind service to runner

---
 daggerverse/gale/dagger.json        |  3 ++-
 daggerverse/gale/runner.go          |  3 +++
 examples/workflows/step-docker.yaml | 36 -----------------------------
 examples/workflows/step-run.yaml    | 33 --------------------------
 examples/workflows/step.yaml        |  3 +++
 5 files changed, 8 insertions(+), 70 deletions(-)
 delete mode 100644 examples/workflows/step-docker.yaml
 delete mode 100644 examples/workflows/step-run.yaml

diff --git a/daggerverse/gale/dagger.json b/daggerverse/gale/dagger.json
index cdd45bf6..baef24b1 100644
--- a/daggerverse/gale/dagger.json
+++ b/daggerverse/gale/dagger.json
@@ -4,6 +4,7 @@
   "sdk": "go",
   "dependencies": [
     "../repo",
-    "../source"
+    "../source",
+    "github.com/aweris/daggerverse/docker@969bc30a84b48f76a28afab3986144d2e47469df"
   ]
 }
diff --git a/daggerverse/gale/runner.go b/daggerverse/gale/runner.go
index 03e968e3..0b5825ad 100644
--- a/daggerverse/gale/runner.go
+++ b/daggerverse/gale/runner.go
@@ -70,6 +70,9 @@ func (r *Runner) Container(
 	ctr = ctr.With(dag.Source().ArtifactService().BindAsService)
 	ctr = ctr.With(dag.Source().ArtifactCacheService().BindAsService)
 
+	// extra services
+	ctr = ctr.With(dag.Docker().WithCacheVolume("gale-docker-cache").BindAsService)
+
 	// configure repo
 	ctr = ctr.With(info.Configure)
 
diff --git a/examples/workflows/step-docker.yaml b/examples/workflows/step-docker.yaml
deleted file mode 100644
index 09309dd4..00000000
--- a/examples/workflows/step-docker.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: docker
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git log
-        uses: docker://alpine/git:latest
-        with:
-          args: log --pretty=oneline
-
-      - name: Print go.mod
-        uses: docker://alpine:latest
-        with:
-          entrypoint: /bin/cat
-          args: go.mod
-
-      - name: Use env and expression
-        uses: docker://alpine:latest
-        with:
-          entrypoint: /bin/echo
-          args: ${{ github.repository }}
-
-      - name: SVU version bump custom docker action
-        uses: jsok/svu-version-bump-action@v2
-        id: bump
-        with:
-          bump: 'patch'
-
-      - name: Print the version
-        run: echo "The version is ${{ steps.bump.outputs.version }}"
diff --git a/examples/workflows/step-run.yaml b/examples/workflows/step-run.yaml
deleted file mode 100644
index aa895a44..00000000
--- a/examples/workflows/step-run.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: shell
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Default Shell
-        run: echo "Hello World"
-
-      - name: Bash Shell
-        shell: bash
-        run: echo "Hello World"
-
-      - name: Python Shell
-        shell: python
-        run: print("Hello World")
-
-      - name: SH Shell
-        shell: sh
-        run: echo "Hello World"
-
-  ## This job requires a custom runner image with PowerShell installed. Default runner for gale can't run PowerShell.
-  run-pwsh:
-    runs-on: ubuntu-latest
-    steps:
-      - name: PowerShell Shell
-        shell: pwsh
-        run: Write-Host "Hello World"
diff --git a/examples/workflows/step.yaml b/examples/workflows/step.yaml
index 6bb9d8ab..815d9672 100644
--- a/examples/workflows/step.yaml
+++ b/examples/workflows/step.yaml
@@ -30,6 +30,9 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      - name: Use Docker Cli directly
+        run: docker info
+
       - name: Git log
         uses: docker://alpine/git:latest
         with: