Skip to content

Commit bf0fe87

Browse files
LK4D4LK4D4
committed
project: fix build rpm
* change workdir for accessing install-binaries.sh * use other gopath for binaries to preserve sources * add sources of proxy and grimes to rpc spec * use dynamic proxy with -linkmode external in deb and rpm Signed-off-by: Alexander Morozov <lk4d4@docker.com>
1 parent a3525d6 commit bf0fe87

File tree

4 files changed

+33
-9
lines changed

4 files changed

+33
-9
lines changed

‎hack/dockerfile/install-binaries.sh‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ CONTAINERD_COMMIT=52ef1ceb4b660c42cf4ea9013180a5663968d4c7
88
GRIMES_COMMIT=74341e923bdf06cfb6b70cf54089c4d3ac87ec2d
99
LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
1010

11-
export GOPATH="$(mktemp -d)"
11+
RM_GOPATH=0
12+
13+
TMP_GOPATH=${TMP_GOPATH:-""}
14+
15+
if [ -z "$TMP_GOPATH" ]; then
16+
export GOPATH="$(mktemp -d)"
17+
RM_GOPATH=1
18+
else
19+
export GOPATH="$TMP_GOPATH"
20+
fi
1221

1322
RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp apparmor selinux"}"
1423

@@ -32,6 +41,14 @@ install_containerd() {
3241
cp bin/ctr /usr/local/bin/docker-containerd-ctr
3342
}
3443

44+
install_proxy() {
45+
echo "Install docker-proxy version $LIBNETWORK_COMMIT"
46+
git clone https://github.com/docker/libnetwork.git "$GOPATH/src/github.com/docker/libnetwork"
47+
cd "$GOPATH/src/github.com/docker/libnetwork"
48+
git checkout -q "$LIBNETWORK_COMMIT"
49+
go build -ldflags="$PROXY_LDFLAGS" -o /usr/local/bin/docker-proxy github.com/docker/libnetwork/cmd/proxy
50+
}
51+
3552
for prog in "$@"
3653
do
3754
case $prog in
@@ -68,11 +85,12 @@ do
6885
;;
6986

7087
proxy)
71-
echo "Install docker-proxy version $LIBNETWORK_COMMIT"
72-
git clone https://github.com/docker/libnetwork.git "$GOPATH/src/github.com/docker/libnetwork"
73-
cd "$GOPATH/src/github.com/docker/libnetwork"
74-
git checkout -q "$LIBNETWORK_COMMIT"
75-
CGO_ENABLED=0 go build -v -o /usr/local/bin/docker-proxy github.com/docker/libnetwork/cmd/proxy
88+
export CGO_ENABLED=0
89+
install_proxy
90+
;;
91+
92+
proxy-dynamic)
93+
PROXY_LDFLAGS="-linkmode=external" install_proxy
7694
;;
7795

7896
*)
@@ -82,4 +100,6 @@ do
82100
esac
83101
done
84102

85-
rm -rf "$GOPATH"
103+
if [ $RM_GOPATH -eq 1 ]; then
104+
rm -rf "$GOPATH"
105+
fi

‎hack/make/.build-rpm/docker-engine.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ install -p -m 644 contrib/syntax/nano/Dockerfile.nanorc $RPM_BUILD_ROOT/usr/shar
195195
/%{_bindir}/docker-containerd-ctr
196196
/%{_bindir}/docker-proxy
197197
/%{_bindir}/docker-runc
198+
/%{_bindir}/docker-init
198199
/%{_sysconfdir}/udev/rules.d/80-docker.rules
199200
%if 0%{?is_systemd}
200201
/%{_unitdir}/docker.service

‎hack/make/build-deb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ set -e
7474

7575
cat >> "$DEST/$version/Dockerfile.build" <<-EOF
7676
# Install runc, containerd, proxy and grimes
77-
RUN ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy grimes
77+
RUN ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic grimes
7878
EOF
7979
cat >> "$DEST/$version/Dockerfile.build" <<-EOF
8080
RUN cp -aL hack/make/.build-deb debian

‎hack/make/build-rpm‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,13 @@ set -e
8989
cat > "$DEST/$version/Dockerfile.build" <<-EOF
9090
FROM $image
9191
COPY . /usr/src/${rpmName}
92+
WORKDIR /usr/src/${rpmName}
9293
RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers
9394
EOF
9495

9596
cat >> "$DEST/$version/Dockerfile.build" <<-EOF
9697
# Install runc, containerd, proxy and grimes
97-
RUN ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy grimes
98+
RUN TMP_GOPATH="/go" ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic grimes
9899
EOF
99100
if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
100101
echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build"
@@ -107,7 +108,9 @@ set -e
107108
WORKDIR /root/rpmbuild/SPECS
108109
RUN tar --exclude .git -r -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar ${rpmName}
109110
RUN tar --exclude .git -r -C /go/src/github.com/docker -f /root/rpmbuild/SOURCES/${rpmName}.tar containerd
111+
RUN tar --exclude .git -r -C /go/src/github.com/docker/libnetwork/cmd -f /root/rpmbuild/SOURCES/${rpmName}.tar proxy
110112
RUN tar --exclude .git -r -C /go/src/github.com/opencontainers -f /root/rpmbuild/SOURCES/${rpmName}.tar runc
113+
RUN tar --exclude .git -r -C /go/ -f /root/rpmbuild/SOURCES/${rpmName}.tar grimes
111114
RUN gzip /root/rpmbuild/SOURCES/${rpmName}.tar
112115
RUN { cat /usr/src/${rpmName}/contrib/builder/rpm/${PACKAGE_ARCH}/changelog; } >> ${rpmName}.spec && tail >&2 ${rpmName}.spec
113116
RUN rpmbuild -ba \

0 commit comments

Comments
 (0)