From ec963bca722cf389e51124a6d0adbd96e6ea3ae6 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Wed, 16 Oct 2024 22:05:08 +0300 Subject: [PATCH 1/4] chore(ci): add registry2 build Signed-off-by: Nikita Korolev chore: try build Signed-off-by: Nikita Korolev chore: change build binary registry Signed-off-by: Nikita Korolev --- images/dvcr/werf.inc.yaml | 42 ++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml index d97262f53..b70fcd41f 100644 --- a/images/dvcr/werf.inc.yaml +++ b/images/dvcr/werf.inc.yaml @@ -1,15 +1,39 @@ --- -image: {{ $.ImageName }}-original-registry2 -final: false -from: {{ .Images.BASE_CONTAINER_REGISTRY }} ---- image: {{ $.ImageName }} from: {{ .Images.BASE_SCRATCH }} import: -- image: {{ $.ImageName }}-original-registry2 - add: /bin +- image: {{ $.ImageName }}-builder + add: /container-registry-binary to: /bin after: install - includePaths: - - registry -# Registry configuration is stored in configmap: templates/dvcr/configmap.yaml \ No newline at end of file +# Registry configuration is stored in configmap: templates/dvcr/configmap.yaml +--- +{{- $version := "2.8.3" }} + +image: {{ $.ImageName }}-builder +final: false +fromImage: base-alt-p10 +shell: + install: + - | + apt-get update && apt-get install -y \ + git openssh golang + + export GOPATH=$(go env GOPATH) + export GOROOT=$(go env GOROOT) + export PATH=$PATH:$GOPATH/bin:$GOROOT/bin + export GO111MODULE=off + + mkdir -p /container-registry-binary + mkdir -p $GOPATH/src/github.com/docker + + cd $GOPATH/src/github.com/docker + git clone --depth 1 --branch v{{ $version }} {{ $.SOURCE_REPO }}/docker/distribution.git + cd distribution + + go build -o /container-registry-binary/ -gcflags "-N -l" -ldflags '-s -w -X registry/version.Version=v{{ $version }} -X registry/version.Revision=v{{ $version }} -X registry/version.Package=v{{ $version }}' ./cmd/... + - | + echo "Clean up" + apt-get clean + rm --recursive --force /var/lib/apt/lists/ftp.altlinux.org* /var/cache/apt/*.bin + rm -rf $(go env GOCACHE) From e95c5b1f8b08abbd8a81603236494044b05b7354 Mon Sep 17 00:00:00 2001 From: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:57:51 +0300 Subject: [PATCH 2/4] Update images/dvcr/werf.inc.yaml Co-authored-by: Ivan Mikheykin Signed-off-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com> --- images/dvcr/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml index b70fcd41f..67f9f56fb 100644 --- a/images/dvcr/werf.inc.yaml +++ b/images/dvcr/werf.inc.yaml @@ -31,7 +31,7 @@ shell: git clone --depth 1 --branch v{{ $version }} {{ $.SOURCE_REPO }}/docker/distribution.git cd distribution - go build -o /container-registry-binary/ -gcflags "-N -l" -ldflags '-s -w -X registry/version.Version=v{{ $version }} -X registry/version.Revision=v{{ $version }} -X registry/version.Package=v{{ $version }}' ./cmd/... + go build -o /container-registry-binary/ -gcflags "-N -l" -ldflags '-s -w -X registry/version.Version=v{{ $version }} -X registry/version.Revision=v{{ $version }}' ./cmd/registry - | echo "Clean up" apt-get clean From e0a24ffcf78c038563528a90218362f1995da210 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Thu, 17 Oct 2024 21:59:56 +0300 Subject: [PATCH 3/4] chore: resolve comments Signed-off-by: Nikita Korolev --- images/dvcr/werf.inc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml index 67f9f56fb..4d49bd34d 100644 --- a/images/dvcr/werf.inc.yaml +++ b/images/dvcr/werf.inc.yaml @@ -21,7 +21,6 @@ shell: export GOPATH=$(go env GOPATH) export GOROOT=$(go env GOROOT) - export PATH=$PATH:$GOPATH/bin:$GOROOT/bin export GO111MODULE=off mkdir -p /container-registry-binary From f480fe0776515ca75902eaf161c4d9b0a75f57cf Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Fri, 18 Oct 2024 13:00:42 +0300 Subject: [PATCH 4/4] chore(ci): remove gcflags Signed-off-by: Nikita Korolev --- images/dvcr/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/dvcr/werf.inc.yaml b/images/dvcr/werf.inc.yaml index 4d49bd34d..5ffd16233 100644 --- a/images/dvcr/werf.inc.yaml +++ b/images/dvcr/werf.inc.yaml @@ -30,7 +30,7 @@ shell: git clone --depth 1 --branch v{{ $version }} {{ $.SOURCE_REPO }}/docker/distribution.git cd distribution - go build -o /container-registry-binary/ -gcflags "-N -l" -ldflags '-s -w -X registry/version.Version=v{{ $version }} -X registry/version.Revision=v{{ $version }}' ./cmd/registry + go build -o /container-registry-binary/ -ldflags '-s -w -X registry/version.Version=v{{ $version }} -X registry/version.Revision=v{{ $version }}' ./cmd/registry - | echo "Clean up" apt-get clean