Skip to content

Commit 17aea59

Browse files
authored
Cdi Shared Server Binary (#10382)
1 parent fd65237 commit 17aea59

1 file changed

Lines changed: 28 additions & 21 deletions

File tree

SPECS/containerized-data-importer/containerized-data-importer.spec

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Summary: Container native virtualization
1919
Name: containerized-data-importer
2020
Version: 1.57.0
21-
Release: 4%{?dist}
21+
Release: 5%{?dist}
2222
License: ASL 2.0
2323
Vendor: Microsoft Corporation
2424
Distribution: Azure Linux
@@ -115,26 +115,30 @@ tar --strip-components=1 -xf %{SOURCE0}
115115
%build
116116

117117
export GOPATH=%{_builddir}/go
118-
export GOFLAGS+="-buildmode=pie -mod=vendor"
119-
env \
120-
CDI_SOURCE_DATE_EPOCH="$(date -r LICENSE +%s)" \
121-
CDI_GIT_COMMIT='v%{version}' \
122-
CDI_GIT_VERSION='v%{version}' \
123-
CDI_GIT_TREE_STATE="clean" \
124-
./hack/build/build-go.sh build \
125-
cmd/cdi-apiserver \
126-
cmd/cdi-cloner \
127-
cmd/cdi-controller \
128-
cmd/cdi-importer \
129-
cmd/cdi-uploadproxy \
130-
cmd/cdi-uploadserver \
131-
cmd/cdi-operator \
132-
tools/cdi-containerimage-server \
133-
tools/cdi-image-size-detection \
134-
tools/cdi-source-update-poller \
135-
tools/csv-generator \
136-
%{nil}
137-
118+
export GOFLAGS="-mod=vendor"
119+
export CDI_SOURCE_DATE_EPOCH="$(date -r LICENSE +%s)"
120+
export CDI_GIT_COMMIT='v%{version}'
121+
export CDI_GIT_VERSION='v%{version}'
122+
export CDI_GIT_TREE_STATE="clean"
123+
124+
GOFLAGS="-buildmode=pie ${GOFLAGS}" ./hack/build/build-go.sh build \
125+
cmd/cdi-apiserver \
126+
cmd/cdi-cloner \
127+
cmd/cdi-controller \
128+
cmd/cdi-importer \
129+
cmd/cdi-uploadproxy \
130+
cmd/cdi-uploadserver \
131+
cmd/cdi-operator \
132+
tools/cdi-image-size-detection \
133+
tools/cdi-source-update-poller \
134+
tools/csv-generator \
135+
%{nil}
136+
137+
# Disable cgo to build static binaries, so they can run on scratch images
138+
CGO_ENABLED=0 ./hack/build/build-go.sh build \
139+
tools/cdi-containerimage-server \
140+
%{nil}
141+
138142
./hack/build/build-manifests.sh
139143

140144
%install
@@ -217,6 +221,9 @@ install -m 0644 _out/manifests/release/cdi-cr.yaml %{buildroot}%{_datadir}/cdi/m
217221
%{_datadir}/cdi/manifests
218222

219223
%changelog
224+
* Fri Sep 06 2024 Aditya Dubey <adityadubey@microsoft.com> - 1.57.0-5
225+
- Statically building binaries
226+
220227
* Fri Jul 19 2024 Aditya Dubey <adityadubey@microsoft.com> - 1.57.0-4
221228
- Building cdi tool binaries within package build
222229

0 commit comments

Comments
 (0)