Skip to content

Commit d5fb29d

Browse files
crazy-maxcrazy-max
committed
pkg: fix docker daemon build path and output folder
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
1 parent ae0d3dc commit d5fb29d

9 files changed

Lines changed: 10 additions & 17 deletions

File tree

‎deb/common/rules‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ override_dh_builddeb:
1010

1111
override_dh_auto_build:
1212
# Build the daemon and dependencies
13-
cd engine && DOCKER_GITCOMMIT=$(ENGINE_GITCOMMIT) PRODUCT=docker ./hack/make.sh dynbinary
14-
cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
15-
cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh rootlesskit dynamic
13+
cd /go/src/github.com/docker/docker && DOCKER_GITCOMMIT=$(ENGINE_GITCOMMIT) PRODUCT=docker ./hack/make.sh dynbinary
14+
cd /go/src/github.com/docker/docker && TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
15+
cd /go/src/github.com/docker/docker && TMP_GOPATH="/go" hack/dockerfile/install/install.sh rootlesskit dynamic
1616
# Build the CLI
1717
cd /go/src/github.com/docker/cli && VERSION=$(VERSION) GITCOMMIT=$(CLI_GITCOMMIT) LDFLAGS='' GO_LINKMODE=dynamic ./scripts/build/binary && DISABLE_WARN_OUTSIDE_CONTAINER=1 LDFLAGS='' make manpages
1818

@@ -40,7 +40,7 @@ override_dh_auto_build:
4040
fi
4141

4242
override_dh_auto_test:
43-
ver="$$(engine/bundles/dynbinary-daemon/dockerd --version)"; \
43+
ver="$$(engine/bundles/dynbinary/dockerd --version)"; \
4444
test "$$ver" = "Docker version $(VERSION), build $(ENGINE_GITCOMMIT)" && echo "PASS: daemon version OK" || (echo "FAIL: daemon version ($$ver) did not match" && exit 1)
4545

4646
ver="$$(cli/build/docker --version)"; \
@@ -71,8 +71,8 @@ override_dh_auto_install:
7171
# docker-ce install
7272
install -D -m 0644 engine/contrib/init/systemd/docker.service debian/docker-ce/lib/systemd/system/docker.service
7373
install -D -m 0644 engine/contrib/init/systemd/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
74-
install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd
75-
install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/docker-proxy) debian/docker-ce/usr/bin/docker-proxy
74+
install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary/dockerd) debian/docker-ce/usr/bin/dockerd
75+
install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary/docker-proxy) debian/docker-ce/usr/bin/docker-proxy
7676
install -D -m 0755 /usr/local/bin/docker-init debian/docker-ce/usr/bin/docker-init
7777

7878
# docker-buildx-plugin install

‎rpm/SPECS/docker-ce.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,18 @@ export DOCKER_GITCOMMIT=%{_gitcommit_engine}
8484
mkdir -p /go/src/github.com/docker
8585
ln -snf ${RPM_BUILD_DIR}/src/engine /go/src/github.com/docker/docker
8686

87-
pushd ${RPM_BUILD_DIR}/src/engine
87+
pushd /go/src/github.com/docker/docker
8888
TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
8989
VERSION=%{_origversion} PRODUCT=docker hack/make.sh dynbinary
9090
popd
9191

9292
%check
93-
ver="$(engine/bundles/dynbinary-daemon/dockerd --version)"; \
93+
ver="$(engine/bundles/dynbinary/dockerd --version)"; \
9494
test "$ver" = "Docker version %{_origversion}, build %{_gitcommit_engine}" && echo "PASS: daemon version OK" || (echo "FAIL: daemon version ($ver) did not match" && exit 1)
9595

9696
%install
97-
install -D -p -m 0755 $(readlink -f engine/bundles/dynbinary-daemon/dockerd) ${RPM_BUILD_ROOT}%{_bindir}/dockerd
98-
install -D -p -m 0755 $(readlink -f engine/bundles/dynbinary-daemon/docker-proxy) ${RPM_BUILD_ROOT}%{_bindir}/docker-proxy
97+
install -D -p -m 0755 $(readlink -f engine/bundles/dynbinary/dockerd) ${RPM_BUILD_ROOT}%{_bindir}/dockerd
98+
install -D -p -m 0755 $(readlink -f engine/bundles/dynbinary/docker-proxy) ${RPM_BUILD_ROOT}%{_bindir}/docker-proxy
9999
install -D -p -m 0755 /usr/local/bin/docker-init ${RPM_BUILD_ROOT}%{_bindir}/docker-init
100100

101101
# install systemd scripts

‎rpm/centos-7/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ ENV GOPROXY=https://proxy.golang.org
1515
ENV GO111MODULE=off
1616
ENV GOPATH=/go
1717
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
18-
ENV AUTO_GOPATH 1
1918
ARG DISTRO
2019
ARG SUITE
2120
ENV DISTRO=${DISTRO}

‎rpm/centos-8/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ENV GOPROXY=direct
1010
ENV GO111MODULE=off
1111
ENV GOPATH=/go
1212
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
13-
ENV AUTO_GOPATH 1
1413
ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
1514
ARG DISTRO
1615
ARG SUITE

‎rpm/centos-9/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ENV GOPROXY=direct
1010
ENV GO111MODULE=off
1111
ENV GOPATH=/go
1212
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
13-
ENV AUTO_GOPATH 1
1413
ENV DOCKER_BUILDTAGS exclude_graphdriver_btrfs
1514
ARG DISTRO
1615
ARG SUITE

‎rpm/fedora-34/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ENV GOPROXY=direct
1010
ENV GO111MODULE=off
1111
ENV GOPATH /go
1212
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
13-
ENV AUTO_GOPATH 1
1413
ARG DISTRO
1514
ARG SUITE
1615
ENV DISTRO=${DISTRO}

‎rpm/fedora-35/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ENV GOPROXY=direct
1010
ENV GO111MODULE=off
1111
ENV GOPATH /go
1212
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
13-
ENV AUTO_GOPATH 1
1413
ARG DISTRO
1514
ARG SUITE
1615
ENV DISTRO=${DISTRO}

‎rpm/fedora-36/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ENV GOPROXY=direct
1010
ENV GO111MODULE=off
1111
ENV GOPATH /go
1212
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
13-
ENV AUTO_GOPATH 1
1413
ARG DISTRO
1514
ARG SUITE
1615
ENV DISTRO=${DISTRO}

‎rpm/rhel-7/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ENV GOPROXY=direct
1010
ENV GO111MODULE=off
1111
ENV GOPATH=/go
1212
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
13-
ENV AUTO_GOPATH 1
1413
ARG DISTRO
1514
ARG SUITE
1615
ENV DISTRO=${DISTRO}

0 commit comments

Comments
 (0)