[WIP] [master] add PKG_REVISION to static builds #824
+11
−6
Conversation
This file contains 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
This is still failing, and needs work;
```
=> [linux/arm/v6 binary 1/1] COPY --from=build /out . 0.0s
=> [linux/arm64->amd64 build 2/3] RUN [ ! -f /etc/alpine-release ] && xx-info is-cross && [ "$(xx-info arch)" = "arm64" ] && XX_CC_PREFER_LINKER=ld xx-clang --setup-target-triple || true 0.1s
=> [linux/arm64->amd64 build 3/3] RUN --mount=type=bind,target=.,ro --mount=type=cache,target=/root/.cache --mount=from=dockercore/golang-cross:xx-sdk-extras,target=/xx-sdk,src=/xx-sdk --mount= 2.7s
=> [linux/s390x binary 1/1] COPY --from=build /out . 0.0s
=> [darwin/amd64 binary 1/1] COPY --from=build /out . 0.0s
=> [linux/amd64 binary 1/1] COPY --from=build /out . 0.0s
=> [darwin/arm64 binary 1/1] COPY --from=build /out . 0.0s
=> exporting to client directory 3.4s
=> => copying files windows/arm64 33.12MB 3.3s
=> => copying files linux/riscv64 33.48MB 3.3s
=> => copying files darwin/arm64 35.03MB 3.4s
=> => copying files linux/arm64 33.18MB 3.3s
=> => copying files linux/arm/v6 33.26MB 3.2s
=> => copying files darwin/amd64 36.81MB 3.4s
=> => copying files linux/amd64 34.48MB 3.4s
=> => copying files linux/ppc64le 32.76MB 3.2s
=> => copying files linux/arm/v7 33.21MB 3.2s
=> => copying files linux/s390x 34.66MB 3.4s
=> => copying files windows/amd64 34.41MB 3.3s
mkdir -p build/arm/docker
cp /Users/thajeztah/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/cli/build/docker-linux-arm build/arm/docker/docker
cp: /Users/thajeztah/go/src/github.com/docker/docker-ce-packaging/src/github.com/docker/cli/build/docker-linux-arm: No such file or directory
make[1]: *** [cross-arm] Error 1
make: *** [static] Error 2
```
```
tree static/build
static/build
├── arm
│ └── docker
├── linux
│ ├── docker
│ │ ├── containerd
│ │ ├── containerd-shim-runc-v2
│ │ ├── ctr
│ │ ├── docker
│ │ ├── docker-init
│ │ ├── docker-proxy
│ │ ├── dockerd
│ │ └── runc
│ ├── docker-23.0.0-rc.2-1.tgz
│ ├── docker-buildx-plugin-0.10.0-1.tgz
│ ├── docker-rootless-extras
│ │ ├── dockerd-rootless-setuptool.sh
│ │ ├── dockerd-rootless.sh
│ │ ├── rootlesskit
│ │ ├── rootlesskit-docker-proxy
│ │ └── vpnkit
│ └── docker-rootless-extras-23.0.0-rc.2-1.tgz
├── mac
│ ├── amd64
│ │ ├── docker
│ │ │ └── docker
│ │ └── docker-23.0.0-rc.2-1.tgz
│ ├── arm
│ │ └── docker
│ ├── arm64
│ │ ├── docker
│ │ │ └── docker
│ │ └── docker-23.0.0-rc.2-1.tgz
│ ├── docker
│ │ └── docker
│ ├── docker-linux-arm64
│ │ └── docker
│ ├── docker-windows-amd64.exe
│ │ └── docker
│ ├── ppc64le
│ │ └── docker
│ ├── riscv64
│ │ └── docker
│ └── s390x
│ └── docker
└── win
└── amd64
├── docker
│ ├── docker-proxy.exe
│ ├── docker.exe
│ └── dockerd.exe
└── docker-23.0.0-rc.2-1.zip
27 directories, 24 files
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
OH, LOL; it's green in CI, perhaps it was a mistake locally that it failed half-way. Either way; we need to test this with the release pipeline, so postponing this for the next RC or next release (this also likely requires changes in the official image repo (https://github.com/docker-library/docker) |
|
Maybe combine this change with the engine/cli binaries split so we have to adapt to both at once? 😅 |
|
Yes, I was considering to leave this one for later; we have never done packaging-only releases, so don't think this is urgent to get in. I opened it to have a quick look if this would work, but other repositories must be updated (official image, install script, documentation), so keeping it in draft for now as a "reminder to self" to continue work on this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is still failing, and needs work;