feat: change to harbor.front.kjuulh.io
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Kasper Juul Hermansen 2023-05-15 21:57:27 +02:00
parent 5aed38a484
commit 6fe0d0677c
Signed by: kjuulh
GPG Key ID: 57B6E1465221F912
10 changed files with 25 additions and 31 deletions

View File

@ -1,4 +1,4 @@
FROM harbor.server.kjuulh.io/docker-proxy/library/golang:alpine as builder FROM harbor.front.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/bust main.go RUN go build -o dist/bust main.go
FROM harbor.server.kjuulh.io/docker-proxy/library/docker:dind FROM harbor.front.kjuulh.io/docker-proxy/library/docker:dind
WORKDIR /src WORKDIR /src

View File

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

View File

@ -56,7 +56,7 @@ func (p *Pipeline) WithDocker(opts *DockerOpt) *Pipeline {
opts.ImageTag = strconv.FormatInt(time.Now().UTC().UnixMilli(), 10) opts.ImageTag = strconv.FormatInt(time.Now().UTC().UnixMilli(), 10)
} }
tag := fmt.Sprintf("harbor.server.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag) tag := fmt.Sprintf("harbor.front.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag)
_, err := finalImage.Publish(ctx, tag) _, err := finalImage.Publish(ctx, tag)
return err return err

View File

@ -48,7 +48,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.server.kjuulh.io/docker-proxy/library/golang") c := container.LoadImage(client, "harbor.front.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
@ -80,7 +80,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.server.kjuulh.io/docker-proxy/library/alpine" opts.BaseImage = "harbor.front.kjuulh.io/docker-proxy/library/alpine"
} }
binpath := "/usr/bin" binpath := "/usr/bin"
@ -122,7 +122,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.server.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag) tag := fmt.Sprintf("harbor.front.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag)
_, err := finalImage.Publish(ctx, tag) _, err := finalImage.Publish(ctx, tag)
return err return err

View File

@ -38,7 +38,7 @@ func (p *Pipeline) WithRustBin(opts *RustBinOpts) *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.server.kjuulh.io/docker-proxy/library/rust:buster") c := container.LoadImage(client, "harbor.front.kjuulh.io/docker-proxy/library/rust:buster")
c = c.Exec(dagger.ContainerExecOpts{ c = c.Exec(dagger.ContainerExecOpts{
Args: []string{ Args: []string{
"apt", "update", "-y", "apt", "update", "-y",
@ -87,7 +87,7 @@ func (p *Pipeline) WithRustBin(opts *RustBinOpts) *Pipeline {
byg.Step{ byg.Step{
Execute: func(_ byg.Context) error { Execute: func(_ byg.Context) error {
if opts.BaseImage == "" { if opts.BaseImage == "" {
opts.BaseImage = "harbor.server.kjuulh.io/docker-proxy/library/alpine" opts.BaseImage = "harbor.front.kjuulh.io/docker-proxy/library/alpine"
} }
binpath := "/usr/bin" binpath := "/usr/bin"
@ -120,7 +120,7 @@ func (p *Pipeline) WithRustBin(opts *RustBinOpts) *Pipeline {
opts.ImageTag = strconv.FormatInt(time.Now().UTC().UnixMilli(), 10) opts.ImageTag = strconv.FormatInt(time.Now().UTC().UnixMilli(), 10)
} }
tag := fmt.Sprintf("harbor.server.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag) tag := fmt.Sprintf("harbor.front.kjuulh.io/kjuulh/%s:%s", opts.ImageName, opts.ImageTag)
_, err := finalImage.Publish(ctx, tag) _, err := finalImage.Publish(ctx, tag)
return err return err

View File

@ -4,13 +4,13 @@ name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.server.kjuulh.io/kjuulh/bust:1667250488156 image: harbor.front.kjuulh.io/kjuulh/bust:1667250488156
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io" HARBOR_DOCKER_HOST: "harbor.front.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

@ -4,13 +4,13 @@ name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.server.kjuulh.io/kjuulh/bust:1667250488156 image: harbor.front.kjuulh.io/kjuulh/bust:1667250488156
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io" HARBOR_DOCKER_HOST: "harbor.front.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

@ -4,13 +4,13 @@ name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.server.kjuulh.io/kjuulh/bust:1667244085545 image: harbor.front.kjuulh.io/kjuulh/bust:1667244085545
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io" HARBOR_DOCKER_HOST: "harbor.front.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

@ -4,13 +4,13 @@ name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.server.kjuulh.io/docker-proxy/library/docker:dind image: harbor.front.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.server.kjuulh.io" HARBOR_DOCKER_HOST: "harbor.front.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.server.kjuulh.io/kjuulh/bust-builder:${DRONE_COMMIT} || docker pull harbor.front.kjuulh.io/kjuulh/bust-builder:${DRONE_COMMIT} ||
(docker build -t harbor.server.kjuulh.io/kjuulh/bust-builder:${DRONE_COMMIT} -f tmp/bust/Dockerfile . && docker push harbor.server.kjuulh.io/kjuulh/bust-builder:${DRONE_COMMIT}) (docker build -t harbor.front.kjuulh.io/kjuulh/bust-builder:${DRONE_COMMIT} -f tmp/bust/Dockerfile . && docker push harbor.front.kjuulh.io/kjuulh/bust-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.server.kjuulh.io/kjuulh/bust-builder:${DRONE_COMMIT} harbor.front.kjuulh.io/kjuulh/bust-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,16 +1,15 @@
type: docker type: docker
kind: pipeline kind: pipeline
name: "drone-dagger-test" name: "drone-dagger-test"
steps: steps:
- name: "build" - name: "build"
image: harbor.server.kjuulh.io/kjuulh/bust:1667748107856 image: harbor.front.kjuulh.io/kjuulh/bust:1667748107856
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1
HARBOR_DOCKER_HOST: "harbor.server.kjuulh.io" HARBOR_DOCKER_HOST: "harbor.front.kjuulh.io"
HARBOR_DOCKER_USERNAME: HARBOR_DOCKER_USERNAME:
from_secret: "harbor_docker_username" from_secret: "harbor_docker_username"
HARBOR_DOCKER_PASSWORD: HARBOR_DOCKER_PASSWORD:
@ -18,12 +17,9 @@ steps:
commands: commands:
- sleep 5 - sleep 5
- > - >
echo "$${HARBOR_DOCKER_PASSWORD}" | docker login echo "$${HARBOR_DOCKER_PASSWORD}" | docker login --password-stdin --username="$${HARBOR_DOCKER_USERNAME}" "$${HARBOR_DOCKER_HOST}"
--password-stdin
--username="$${HARBOR_DOCKER_USERNAME}"
"$${HARBOR_DOCKER_HOST}"
- bust build rustbin --bin-name {{ .input.binName }}
- bust build rustbin --bin-name {{ .input.binName }}
services: services:
- name: docker - name: docker
image: docker:dind image: docker:dind
@ -31,10 +27,8 @@ services:
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
volumes: volumes:
- name: dockersock - name: dockersock
temp: {} temp: {}
image_pull_secrets: image_pull_secrets:
- dockerconfig - dockerconfig