7 Commits

Author SHA1 Message Date
b1f64fdd74 remove execute on entrypoint 2022-10-31 01:43:19 +01:00
49dab03d9e bumped version 2022-10-31 01:29:52 +01:00
50204fd54f fix ci 2022-10-31 01:16:36 +01:00
cc2aea8c43 move to internal server instead 2022-10-31 01:03:48 +01:00
e9e5d1e958 with err exit 2022-10-31 00:35:40 +01:00
cb789bfa2e with updated template 2022-10-31 00:29:02 +01:00
d5b0d6b25d update version 2022-10-31 00:28:27 +01:00
9 changed files with 29 additions and 18 deletions

View File

@@ -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 WORKDIR /src/builder
@@ -6,7 +6,7 @@ COPY ci/. .
RUN go build -o dist/dagger-go main.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 WORKDIR /src

View File

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

View File

@@ -63,6 +63,12 @@ git.front.kjuulh.io/kjuulh/dagger-go v0.0.21 h1:r6OuEyxx7yhgD+lrIMDhal4fDuVS5anW
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.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 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.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=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.24 h1:ibNRgODcSY0xraafFvO+vBvAQnGlQKV4U9vyfNZcKIw=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.24/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.26 h1:IOaiCwvlnoV/livETEgbHjYEFNfaaN85sj4mv2j4E4E=
git.front.kjuulh.io/kjuulh/dagger-go v0.0.26/go.mod h1:N/EXT0aOJzph/9AXuFlaA2ZuKU0P8WzaDZQXLlAL0D8=
github.com/99designs/gqlgen v0.17.2/go.mod h1:K5fzLKwtph+FFgh9j7nFbRUdBKvTcGnsta51fsMTn3o= 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/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=

View File

@@ -26,7 +26,7 @@ func main() {
}, },
BuildPath: "main.go", BuildPath: "main.go",
BinName: "dagger-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) Execute(ctx)

View File

@@ -4,13 +4,13 @@ name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.front.kjuulh.io/docker-proxy/library/docker:dind image: harbor.server.kjuulh.io/docker-proxy/library/docker:dind
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
HARBOR_DOCKER_HOST: "harbor.front.kjuulh.io" HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io"
HARBOR_DOCKER_USERNAME: HARBOR_DOCKER_USERNAME:
from_secret: "harbor_docker_username" from_secret: "harbor_docker_username"
HARBOR_DOCKER_PASSWORD: HARBOR_DOCKER_PASSWORD:
@@ -26,8 +26,8 @@ steps:
--username="$${HARBOR_DOCKER_USERNAME}" --username="$${HARBOR_DOCKER_USERNAME}"
"$${HARBOR_DOCKER_HOST}" "$${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 docker run
-e DRONE_REPO_NAME="${DRONE_REPO_NAME}" -e DRONE_REPO_NAME="${DRONE_REPO_NAME}"
@@ -36,7 +36,7 @@ steps:
-e HARBOR_DOCKER_PASSWORD=$${HARBOR_DOCKER_PASSWORD} -e HARBOR_DOCKER_PASSWORD=$${HARBOR_DOCKER_PASSWORD}
-v "$PWD/:/src/" -v "$PWD/:/src/"
-v /var/run/docker.sock:/var/run/docker.sock -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 sh -c 'echo "$$HARBOR_DOCKER_PASSWORD" | docker login
--password-stdin --password-stdin
--username="$$HARBOR_DOCKER_USERNAME" --username="$$HARBOR_DOCKER_USERNAME"

View File

@@ -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 WORKDIR /src/builder
@@ -6,7 +6,7 @@ COPY tmp/dagger-go .
RUN go build -o dist/dagger-go main.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 WORKDIR /src

View File

@@ -4,13 +4,13 @@ name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.front.kjuulh.io/kjuulh/dagger-go:1667171629427 image: harbor.server.kjuulh.io/kjuulh/dagger-go:1667176154540
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
HARBOR_DOCKER_HOST: "harbor.front.kjuulh.io" HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io"
HARBOR_DOCKER_USERNAME: HARBOR_DOCKER_USERNAME:
from_secret: "harbor_docker_username" from_secret: "harbor_docker_username"
HARBOR_DOCKER_PASSWORD: HARBOR_DOCKER_PASSWORD:

View File

@@ -34,7 +34,7 @@ func BuildGolangBin() *cobra.Command {
}, },
BuildPath: "main.go", BuildPath: "main.go",
BinName: "main", BinName: "main",
ExecuteOnEntrypoint: true, ExecuteOnEntrypoint: false,
}). }).
Execute(ctx) Execute(ctx)
}, },

View File

@@ -47,7 +47,7 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
byg.Step{ byg.Step{
Execute: func(_ byg.Context) error { Execute: func(_ byg.Context) error {
var err 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") c, err = container.MountCurrent(ctx, client, c, "/src")
if err != nil { if err != nil {
return err return err
@@ -73,7 +73,7 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
byg.Step{ byg.Step{
Execute: func(_ byg.Context) error { Execute: func(_ byg.Context) error {
if opts.BaseImage == "" { if opts.BaseImage == "" {
opts.BaseImage = "harbor.front.kjuulh.io/docker-proxy/library/busybox" opts.BaseImage = "harbor.server.kjuulh.io/docker-proxy/library/busybox"
} }
binpath := "/usr/bin" binpath := "/usr/bin"
@@ -82,7 +82,12 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
c = c.Exec(dagger.ContainerExecOpts{ c = c.Exec(dagger.ContainerExecOpts{
Args: []string{"mkdir", "-p", binpath}, Args: []string{"mkdir", "-p", binpath},
}) })
c, err := container.MountFileFromLoaded(ctx, c, bin, usrbin) _, err := c.ExitCode(ctx)
if err != nil {
return err
}
c, err = container.MountFileFromLoaded(ctx, c, bin, usrbin)
if err != nil { if err != nil {
return err return err
} }
@@ -110,7 +115,7 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
opts.ImageTag = strconv.FormatInt(time.Now().UTC().UnixMilli(), 10) 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) _, err := finalImage.Publish(ctx, tag)
return err return err