move to internal server instead
This commit is contained in:
parent
e9e5d1e958
commit
cc2aea8c43
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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 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 pull harbor.server.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"
|
||||
|
@ -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
|
||||
|
||||
|
@ -4,13 +4,13 @@ name: "drone-dagger-test"
|
||||
|
||||
steps:
|
||||
- name: "build"
|
||||
image: harbor.front.kjuulh.io/kjuulh/dagger-go:1667172485156
|
||||
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:
|
||||
|
@ -47,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
|
||||
@ -73,7 +73,7 @@ func (p *Pipeline) WithGolangBin(opts *GolangBinOpts) *Pipeline {
|
||||
byg.Step{
|
||||
Execute: func(_ byg.Context) error {
|
||||
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"
|
||||
@ -115,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
|
||||
|
Loading…
Reference in New Issue
Block a user