[master] fix build-script for docker-proxy (after libnetwork integration) and update to Go 1.16.5 #554
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
libnetwork has been integrated in the docker/docker (moby) repository, and now is compiled as part of hack/make.sh dynbinary. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
changed the title
This comment has been minimized.
This comment has been minimized.
Member
Author
|
According to https://bugs.centos.org/view.php?id=18212 / ComplianceAsCode/content#7016, looks like upgrading to libarchive-3.3.3-1.el8.x86_64 should resolve the problem. |
Trying to fix
+ echo 'Install tini version de40ad007797e0dcd8b7126f27bb87401d224240'
+ git clone https://github.com/krallin/tini.git /go/tini
Install tini version de40ad007797e0dcd8b7126f27bb87401d224240
Cloning into '/go/tini'...
+ cd /go/tini
+ git checkout -q de40ad007797e0dcd8b7126f27bb87401d224240
+ cmake .
cmake: symbol lookup error: cmake: undefined symbol: archive_write_add_filter_zstd
error: Bad exit status from /var/tmp/rpm-tmp.Dl5CDf (%build)
According to https://bugs.centos.org/view.php?id=18212, upgrading to libarchive-3.3.3-1.el8.x86_64
should resolve the problem.
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Not sure why, but looks like the path used `<arch>-daemon` (instead of just `<arch>`).
However, it's not consistent either, because `containerutility.exe` is in `<arch>`?
When running:
make REF=master checkout
make REF=master DOCKER_BUILD_PKGS=cross-win static
The build failed:
mkdir -p build/win/amd64/docker
cp /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/cli/build/docker-windows-amd64.exe build/win/amd64/docker/docker.exe
cp /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/cross/windows/amd64/dockerd-0.0.0-20210629140245-4a6fe51.exe build/win/amd64/docker/dockerd.exe
cp: /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/cross/windows/amd64/dockerd-0.0.0-20210629140245-4a6fe51.exe: No such file or directory
make[1]: *** [cross-win] Error 1
make: *** [static] Error 2
This is what's in bundles:
tree /Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/
/Users/sebastiaan/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/docker/bundles/
└── cross
└── windows
├── amd64
│ └── containerutility.exe
└── amd64-daemon
├── docker-proxy-0.0.0-20210629140245-4a6fe51.exe
├── docker-proxy-0.0.0-20210629140245-4a6fe51.exe.md5
├── docker-proxy-0.0.0-20210629140245-4a6fe51.exe.sha256
├── docker-proxy.exe -> docker-proxy-0.0.0-20210629140245-4a6fe51.exe
├── dockerd-0.0.0-20210629140245-4a6fe51.exe
├── dockerd-0.0.0-20210629140245-4a6fe51.exe.md5
├── dockerd-0.0.0-20210629140245-4a6fe51.exe.sha256
└── dockerd.exe -> dockerd-0.0.0-20210629140245-4a6fe51.exe
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 task
thaJeztah
commented
Jul 2, 2021
Comment on lines
+65
to
+66
| cp $(ENGINE_DIR)/bundles/cross/windows/amd64-daemon/dockerd-$(GEN_STATIC_VER).exe build/win/amd64/docker/dockerd.exe | ||
| cp $(ENGINE_DIR)/bundles/cross/windows/amd64-daemon/docker-proxy-$(GEN_STATIC_VER).exe build/win/amd64/docker/dockerd.exe |
Member
Author
There was a problem hiding this comment.
This PR fixes the issue, but after this I want to look in the upstream moby repository "why" this path changed, because there's also some inconsistency here (<arch>-daemon for some binaries, and <arch> for others); see 09541b5
thaJeztah
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
libnetwork has been integrated in the docker/docker (moby) repository, and now is compiled as part of hack/make.sh dynbinary.
relates to moby/moby#42262 and moby/moby#42539