Skip to content

pkg(docker-cli,docker-engine): add arm/v5 platform - #78

Merged
crazy-max merged 3 commits into
docker:mainfrom
crazy-max:armv5
Apr 8, 2023
Merged

pkg(docker-cli,docker-engine): add arm/v5 platform#78
crazy-max merged 3 commits into
docker:mainfrom
crazy-max:armv5

Conversation

@crazy-max

Copy link
Copy Markdown
Member

No description provided.

@crazy-max

crazy-max commented Jan 20, 2023

Copy link
Copy Markdown
MemberAuthor

dockercore/golang-cross:xx-sdk-extras image does not have a dummy linux/arm/v5 platform and therefore fails: https://github.com/docker/packaging/actions/runs/3972039519/jobs/6809553054#step:7:191

> [linux/arm/v5 internal] load metadata for docker.io/dockercore/golang-cross:xx-sdk-extras:
------
Dockerfile:41
--------------------
39 | 40 | # osxcross contains the MacOSX SDK for xx
41 | >>> FROM dockercore/golang-cross:xx-sdk-extras AS osxsdk
42 | 43 | # go base image to retrieve /usr/local/go
--------------------
ERROR: failed to solve: dockercore/golang-cross:xx-sdk-extras: no match for platform in manifest sha256:9ac9641111aeb58ce39b1e7423f80dd08af0e05d1c9fa38725f6ee37a1573b41: not found

@tianon

Copy link
Copy Markdown
Contributor

Resulting binaries look OK on my system: 👀

$ cat /proc/cpuinfoprocessor	: 0model name	: Feroceon 88FR131 rev 1 (v5l)BogoMIPS	: 400.00Features	: swp half thumb fastmult edsp CPU implementer	: 0x56CPU architecture: 5TECPU variant	: 0x2CPU part	: 0x131CPU revision	: 1Hardware	: Marvell Kirkwood (Flattened Device Tree)Revision	: 0000Serial : 0000000000000000
$ ./dockerd --versionDocker version v0.0.0-20230115001426-98c1140, build 98c1140c4490699d65a2fcd1009570fc0e412550
$ ./docker-init --versiontini version 0.19.0 - git.de40ad0
$ ./docker-proxy --versiondocker-proxy (commit 98c1140c4490699d65a2fcd1009570fc0e412550) version v0.0.0-20230115001426-98c1140

@crazy-max
crazy-maxforce-pushed the armv5 branch 4 times, most recently from ad533cf to e089f95CompareJanuary 21, 2023 00:23
@crazy-max
crazy-max marked this pull request as ready for review January 21, 2023 10:42
Comment on lines +187 to +195
FROM build-base-static AS builder-static-nosdk
ARG DEBIAN_FRONTEND
RUN apt-get install -y --no-install-recommends dpkg-dev clang lld llvm make pkg-config
ARG PKG_NAME
ARG DOCKER_CLI_REF
ARG NIGHTLY_BUILD
WORKDIR /build
ARG TARGETPLATFORM
RUN xx-apt-get install -y gcc libc6-dev

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if it makes a difference for caching, but some questions;

  • move the PKG_NAME and some of the other ones later?
  • do the apt-get and xx-apt-get steps have to be separate? (would it make sense to combine them otherwise?)
  • does xx-apt... use TARGETPLATFORM? If not, that one could be moved until after that step as well
Suggested change
FROM build-base-static AS builder-static-nosdk
ARG DEBIAN_FRONTEND
RUN apt-get install -y --no-install-recommends dpkg-dev clang lld llvm make pkg-config
ARG PKG_NAME
ARG DOCKER_CLI_REF
ARG NIGHTLY_BUILD
WORKDIR /build
ARG TARGETPLATFORM
RUN xx-apt-get install -y gcc libc6-dev
FROM build-base-static AS builder-static-nosdk
WORKDIR /build
ARG DEBIAN_FRONTEND
RUN xx-apt-get install -y --no-install-recommends \
clang \
dpkg-dev \
gcc \
libc6-dev \
lld \
llvm \
make \
pkg-config
ARG DOCKER_CLI_REF
ARG NIGHTLY_BUILD
ARG PKG_NAME
ARG TARGETPLATFORM

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • move the PKG_NAME and some of the other ones later?

Yes good point, could be moved after xx-apt

  • do the apt-get and xx-apt-get steps have to be separate? (would it make sense to combine them otherwise?)

Yes they have because xx-apt-get is using TARGET_PLATFORM.

  • does xx-apt... use TARGETPLATFORM? If not, that one could be moved until after that step as well

Yes every xx-* command needs TARGETPLATFORM.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Avoids issue with dockercore/golang-cross:xx-sdk-extras that doesn't have
a dummy linux/arm/v5 platform
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
@crazy-max
crazy-max merged commit cf554af into docker:mainApr 8, 2023
@crazy-max
crazy-max deleted the armv5 branch April 8, 2023 21:03
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@crazy-max@tianon@thaJeztah