From dfa693ea080bfac3765d674c43724a6f733fe9fe Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Sat, 29 Oct 2022 23:06:06 +0200
Subject: [PATCH] with base src/

---
 Dockerfile              |  2 +-
 dagger_go_template.yaml |  6 +++---
 pkg/tasks/build.go      | 20 +-------------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f85e6df..f48d846 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN go build -o dist/dagger-go main.go
 
 FROM harbor.front.kjuulh.io/docker-proxy/library/docker:dind
 
-WORKDIR /src/docker
+WORKDIR /src
 
 COPY --from=builder /src/builder/dist/dagger-go /usr/bin/
 
diff --git a/dagger_go_template.yaml b/dagger_go_template.yaml
index 265334c..c6ef4bb 100644
--- a/dagger_go_template.yaml
+++ b/dagger_go_template.yaml
@@ -16,9 +16,9 @@ steps:
       - "sleep 5"
       - apk add git
       - mkdir -p tmp/dagger-go
-      - git clone "https://git.front.kjuulh.io/kjuulh/dagger-go.git" tmp/dagger-go
-      - docker build -t dagger-go-builder:${DRONE_COMMIT} -f tmp/dagger-go/Dockerfile .
-      - 'docker run -v "$PWD/:/src/build" -v /var/run/docker.sock:/var/run/docker.sock dagger-go-builder:${DRONE_COMMIT} dagger-go build --image-tag "{{ or .input.imageTag $imageTag }}"'
+      - git clone "https://git.front.kjuulh.io/kjuulh/dagger-go.git" /mnt/dagger-go
+      - docker build -t dagger-go-builder:${DRONE_COMMIT} -f mnt/dagger-go/Dockerfile .
+      - 'docker run -v "$PWD/:/src" -v /var/run/docker.sock:/var/run/docker.sock dagger-go-builder:${DRONE_COMMIT} dagger-go build --image-tag "{{ or .input.imageTag $imageTag }}"'
 
 services:
   - name: docker
diff --git a/pkg/tasks/build.go b/pkg/tasks/build.go
index 97a1c7e..25a750b 100644
--- a/pkg/tasks/build.go
+++ b/pkg/tasks/build.go
@@ -31,24 +31,6 @@ func Build(builder *internal.Builder, imageTag string) error {
 						return err
 					}
 
-					log.Println("listing files in /src/build")
-					dir, err := os.ReadDir("/src/build")
-					if err == nil {
-						for _, d := range dir {
-							log.Printf("content: %s\n", d.Name())
-						}
-					} else {
-						return err
-					}
-
-					log.Println("listing files in /src/docker")
-					dir, err = os.ReadDir("/src/docker")
-					if err == nil {
-						for _, d := range dir {
-							log.Printf("content: %s\n", d.Name())
-						}
-					}
-
 					log.Println("listing files in /src/")
 					dir, err = os.ReadDir("/src/")
 					if err == nil {
@@ -58,7 +40,7 @@ func Build(builder *internal.Builder, imageTag string) error {
 					}
 
 					golang := client.Container().From("golang:latest")
-					golang = golang.WithMountedDirectory("/src/build", src).WithWorkdir("/src")
+					golang = golang.WithMountedDirectory("/src", src).WithWorkdir("/src")
 					_, err = golang.Exec(dagger.ContainerExecOpts{
 						Args: []string{"go", "build", "-o", "build/"},
 					}).ExitCode(ctx)