diff --git a/daggerverse/gale/dagger.json b/daggerverse/gale/dagger.json index cdd45bf..baef24b 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 03e968e..0b5825a 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 09309dd..0000000 --- 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 aa895a4..0000000 --- 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 6bb9d8a..815d967 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: