Uh oh!
There was an error while loading. Please reload this page.
Fix image based build to address for upstream changes - #417
Conversation
Upstream moby/moby#40180 removed the auto-generated code, replacing it with build-time variables (-X). This patch updates the Dockerfiles to account for this change. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Jan 19, 2020
ping @arkodg@zelahi@StefanScherer PTAL 🤗 |
| RUN go build -o /dockerd \ | ||
| -tags 'autogen apparmor seccomp selinux journald' \ | ||
| RUN source ./hack/make/.go-autogen; \ | ||
| go build -o /sbin/dockerd \ |
There was a problem hiding this comment.
This /sbin/dockerd will cause a problem in the last stage. There's a COPY --from in line 80 that uses /dockerd as source.
This lead to a next question, why are there two relatively similar Dockerfile.engine* files that we have to maintain?
At least we should use the same pathes in both Dockerfiles, so the COPY instruction must be updated.
There was a problem hiding this comment.
🤦♂ I worked on one file, then copied to the other file, but forgot they had different paths.
| ARG PLATFORM | ||
| ARG PRODUCT | ||
| ARG DEFAULT_PRODUCT_LICENSE | ||
| ARG TINI_COMMIT |
There was a problem hiding this comment.
Do we need to pass in that argument somewhere with --build-arg TINI_COMMIT ?
There was a problem hiding this comment.
Hm.. good one; let me check if it's passed somewhere
There was a problem hiding this comment.
even wondering how this worked at all, because the binaries-commits file was removed in moby/moby@b529d1b
seemethere
left a comment
There was a problem hiding this comment.
These files don’t matter anymore since docker engine activate was deprecated and should be removed.
thaJeztah
commented
Jan 20, 2020
Yeah, perhaps we should just go for #411, which removes this stuff. I started with this because I thought the problem was in build in general, but it was only in the image-based build. |
thaJeztah
commented
Jan 21, 2020
superseded by #411 |
depends on moby/moby#40393
Upstream moby/moby#40180 removed the auto-generated code, replacing
it with build-time variables (-X).
This patch updates the Dockerfiles to account for this change.