move to internal server instead

.gitignore

@@ -0,0 +1 @@
+main

Dockerfile

@@ -1,4 +1,4 @@
-FROM harbor.front.kjuulh.io/docker-proxy/library/golang:alpine as builder
+FROM harbor.server.kjuulh.io/docker-proxy/library/golang:alpine as builder
 
 WORKDIR /src/builder
 
@@ -6,7 +6,7 @@ COPY ci/. .
 
 RUN go build -o dist/dagger-go main.go
 
-FROM harbor.front.kjuulh.io/docker-proxy/library/docker:dind
+FROM harbor.server.kjuulh.io/docker-proxy/library/docker:dind
 
 WORKDIR /src
 

ci/go.mod

@@ -2,7 +2,7 @@ module ci
 
 go 1.19
 
-require git.front.kjuulh.io/kjuulh/dagger-go v0.0.9
+require git.front.kjuulh.io/kjuulh/dagger-go v0.0.23
 
 require (
 	dagger.io/dagger v0.3.1 // indirect

ci/go.sum

@@ -41,6 +41,30 @@ git.front.kjuulh.io/kjuulh/dagger-go v0.0.8 h1:hbXEOYw3Q3sdwMjaEMz+v/TOnyUWSDAYF
 git.front.kjuulh.io/kjuulh/dagger-go v0.0.8/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
 git.front.kjuulh.io/kjuulh/dagger-go v0.0.9 h1:XxKhvUM8q7QcRSTeE7hF56zoXKGOncdHBdccKBKnS6M=
 git.front.kjuulh.io/kjuulh/dagger-go v0.0.9/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.10 h1:d9VNhI6OsiR/W4/1iJvchuHwTq2C3AHw3yetncKWfUM=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.10/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.11 h1:j3ylHiGmhcFomggJcrNJghbYBK/nuuvw0naFBIWqEqo=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.11/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.12 h1:c75Ac8joaOMfaOSPf+ZcvNdBcytx0hzIJMYXexKGXJ0=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.12/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.15 h1:jYFyZo2S3KPPo+eGd9TqRSqP3U5lqXXguP56STyklLA=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.15/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.16 h1:JP+K+4B3APG/bxKjAV3SHEkm2GSRgsDSeS3vT9fIqnU=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.16/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.17 h1:lo4bvPLwO3AhlMPJOoZnetLY66HSlw2rfCc2Mi1QV38=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.17/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.18 h1:asW/jEmf3HORb6nqgUldoLge/UjEFFnII0YjPYQ+Qg0=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.18/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.19 h1:IgpZ1X5ZDYl/byBSife1wXTBmFHNvHwf1MLw8AZ29R4=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.19/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.20 h1:iw/gnsaGe4SzqbRT6i14LPvu/Cpbe7XiCpnqFfkTLA8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.20/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.21 h1:r6OuEyxx7yhgD+lrIMDhal4fDuVS5anWrXO5lyPMXPg=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.21/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.22 h1:ajOhF6B7M43dPE1BAFoi55yOCSBwCxZYHH0CgFIm0bk=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.22/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.23 h1:6VXEfKu/JodrgFAf5fIwuyqstkDnunHhT1MA/VvnzT0=
+git.front.kjuulh.io/kjuulh/dagger-go v0.0.23/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
 github.com/99designs/gqlgen v0.17.2/go.mod h1:K5fzLKwtph+FFgh9j7nFbRUdBKvTcGnsta51fsMTn3o=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=

ci/main.go

@@ -26,7 +26,7 @@ func main() {
 				},
 				BuildPath: "main.go",
 				BinName:   "dagger-go",
-				BaseImage: "harbor.front.kjuulh.io/docker-proxy/library/docker:dind",
+				BaseImage: "harbor.server.kjuulh.io/docker-proxy/library/docker:dind",
 			}).
 			Execute(ctx)
 

dagger_go_template.yaml

@@ -4,13 +4,13 @@ name: "drone-dagger-test"
 
 steps:
   - name: "build"
-    image: harbor.front.kjuulh.io/docker-proxy/library/docker:dind
+    image: harbor.server.kjuulh.io/docker-proxy/library/docker:dind
     volumes:
       - name: dockersock
         path: /var/run
     environment:
       DOCKER_BUILDKIT: 1
-      HARBOR_DOCKER_HOST: "harbor.front.kjuulh.io"
+      HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io"
       HARBOR_DOCKER_USERNAME:
         from_secret: "harbor_docker_username"
       HARBOR_DOCKER_PASSWORD:
@@ -26,8 +26,8 @@ steps:
         --username="$${HARBOR_DOCKER_USERNAME}"
         "$${HARBOR_DOCKER_HOST}"
       - >
-        docker pull harbor.front.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT} || 
+        docker pull harbor.server.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT} || 
-        (docker build -t harbor.front.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT} -f tmp/dagger-go/Dockerfile . && docker push harbor.front.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT})
+        (docker build -t harbor.server.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT} -f tmp/dagger-go/Dockerfile . && docker push harbor.server.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT})
       - >
         docker run
         -e DRONE_REPO_NAME="${DRONE_REPO_NAME}"
@@ -36,7 +36,7 @@ steps:
         -e HARBOR_DOCKER_PASSWORD=$${HARBOR_DOCKER_PASSWORD}
         -v "$PWD/:/src/"
         -v /var/run/docker.sock:/var/run/docker.sock
-        harbor.front.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT}
+        harbor.server.kjuulh.io/kjuulh/dagger-go-builder:${DRONE_COMMIT}
         sh -c 'echo "$$HARBOR_DOCKER_PASSWORD" |  docker login
         --password-stdin
         --username="$$HARBOR_DOCKER_USERNAME"

default.Dockerfile

@@ -1,4 +1,4 @@
-FROM harbor.front.kjuulh.io/docker-proxy/library/golang:alpine as builder
+FROM harbor.server.kjuulh.io/docker-proxy/library/golang:alpine as builder
 
 WORKDIR /src/builder
 
@@ -6,7 +6,7 @@ COPY tmp/dagger-go .
 
 RUN go build -o dist/dagger-go main.go
 
-FROM harbor.front.kjuulh.io/docker-proxy/library/docker:dind
+FROM harbor.server.kjuulh.io/docker-proxy/library/docker:dind
 
 WORKDIR /src
 

gobin_default_template.yaml

@@ -4,20 +4,25 @@ name: "drone-dagger-test"
 
 steps:
   - name: "build"
-    image: harbor.front.kjuulh.io/kjuulh/dagger-go:1667159344332
+    image: harbor.server.kjuulh.io/kjuulh/dagger-go:1667172485156
     volumes:
       - name: dockersock
         path: /var/run
     environment:
       DOCKER_BUILDKIT: 1
-      HARBOR_DOCKER_HOST: "harbor.front.kjuulh.io"
+      HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io"
       HARBOR_DOCKER_USERNAME:
         from_secret: "harbor_docker_username"
       HARBOR_DOCKER_PASSWORD:
         from_secret: "harbor_docker_password"
     commands:
       - sleep 5
-      - sh -c "/dagger-go build golangbin"
+      - >
+        echo "$${HARBOR_DOCKER_PASSWORD}" | docker login
+        --password-stdin
+        --username="$${HARBOR_DOCKER_USERNAME}"
+        "$${HARBOR_DOCKER_HOST}"
+      - dagger-go build golangbin
 
 services:
   - name: docker

pkg/cli/build_golang_bin.go

@@ -2,7 +2,6 @@ package cli
 
 import (
 	"errors"
-	"fmt"
 	"os"
 
 	"git.front.kjuulh.io/kjuulh/dagger-go/pkg/builder"
@@ -18,7 +17,6 @@ func BuildGolangBin() *cobra.Command {
 			if repoName == "" {
 				return errors.New("could not find DRONE_REPO_NAME")
 			}
-			imageTag := fmt.Sprintf("harbor.front.kjuulh.io/library/%s", repoName)
 
 			ctx := cmd.Context()
 
@@ -32,10 +30,11 @@ func BuildGolangBin() *cobra.Command {
 				New(builder).
 				WithGolangBin(&pipelines.GolangBinOpts{
 					DockerImageOpt: &pipelines.DockerImageOpt{
-						ImageName: imageTag,
+						ImageName: repoName,
 					},
 					BuildPath:           "main.go",
 					BinName:             "main",
+					ExecuteOnEntrypoint: true,
 				}).
 				Execute(ctx)
 		},

pkg/pipelines/golang-bin.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"path"
 	"strconv"
 	"time"
 
@@ -24,6 +25,7 @@ type GolangBinOpts struct {
 	BuildPath           string
 	BinName             string
 	BaseImage           string
+	ExecuteOnEntrypoint bool
 }
 
 func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
@@ -35,7 +37,6 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
 	var (
 		bin        dagger.FileID
 		build      *dagger.Container
-		scratch    *dagger.Container
 		finalImage *dagger.Container
 	)
 
@@ -46,7 +47,7 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
 			byg.Step{
 				Execute: func(_ byg.Context) error {
 					var err error
-					c := container.LoadImage(client, "harbor.front.kjuulh.io/docker-proxy/library/golang")
+					c := container.LoadImage(client, "harbor.server.kjuulh.io/docker-proxy/library/golang")
 					c, err = container.MountCurrent(ctx, client, c, "/src")
 					if err != nil {
 						return err
@@ -66,37 +67,44 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
 					return err
 				},
 			},
-			byg.Step{
-				Execute: func(ctx byg.Context) error {
-					if opts.BaseImage == "" {
-						opts.BaseImage = "harbor.front.kjuulh.io/docker-proxy/library/busybox"
-					}
-
-					scratch = container.LoadImage(client, opts.BaseImage)
-					return nil
-				},
-			},
 		).
 		Step(
 			"create-production-image",
 			byg.Step{
-				Execute: func(ctx byg.Context) error {
+				Execute: func(_ byg.Context) error {
-					tempmount := fmt.Sprintf("/tmp/%s", opts.BinName)
+					if opts.BaseImage == "" {
-					usrbin := fmt.Sprintf("/usr/bin/%s", opts.BinName)
+						opts.BaseImage = "harbor.server.kjuulh.io/docker-proxy/library/busybox"
-					c := container.MountFileFromLoaded(scratch, bin, tempmount)
+					}
+
+					binpath := "/usr/bin"
+					usrbin := path.Join(binpath, opts.BinName)
+					c := container.LoadImage(client, opts.BaseImage)
 					c = c.Exec(dagger.ContainerExecOpts{
-						Args: []string{"mkdir", "-p", "/usr/bin", "&&", "cp", tempmount, usrbin},
+						Args: []string{"mkdir", "-p", binpath},
 					})
-					finalImage = c.WithEntrypoint([]string{opts.BinName})
+					_, err := c.ExitCode(ctx)
+					if err != nil {
+						return err
+					}
+
+					c, err = container.MountFileFromLoaded(ctx, c, bin, usrbin)
+					if err != nil {
+						return err
+					}
+					if opts.ExecuteOnEntrypoint {
+						finalImage = c.WithEntrypoint([]string{usrbin})
+					} else {
+						finalImage = c
+					}
 
 					return nil
 				},
 			},
-			//byg.Step{
+			byg.Step{
-			//	Execute: func(_ byg.Context) error {
+				Execute: func(_ byg.Context) error {
-			//		return golang.Test(ctx, build)
+					return golang.Test(ctx, build)
-			//	},
+				},
-			//},
+			},
 		).
 		Step(
 			"upload-image",
@@ -107,7 +115,7 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
 						opts.ImageTag = strconv.FormatInt(time.Now().UTC().UnixMilli(), 10)
 					}
 
-					tag := fmt.Sprintf("harbor.front.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag)
+					tag := fmt.Sprintf("harbor.server.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag)
 
 					_, err := finalImage.Publish(ctx, tag)
 					return err

pkg/tasks/container/mount.go

@@ -21,7 +21,12 @@ func MountCurrent(ctx context.Context, client *dagger.Client, container *dagger.
 	return container.WithMountedDirectory(into, src), nil
 }
 
-func MountFileFromLoaded(container *dagger.Container, bin dagger.FileID, path string) *dagger.Container {
+func MountFileFromLoaded(ctx context.Context, container *dagger.Container, bin dagger.FileID, path string) (*dagger.Container, error) {
 	log.Printf("mounting binary into container: into (path=%s)", path)
-	return container.WithMountedFile(path, bin)
+	newFs, err := container.FS().WithCopiedFile(path, bin).ID(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return container.WithFS(newFs), nil
 }