Add dockerfile for cross itself #667

bytedream · 2022-03-18T10:45:25Z

This adds a dockerfile which has cross and docker already installed and can be directly used to cross compile and test. It mostly adopts a comment in #260.

It uses docker in docker (#387) so to work correctly it must be run with the docker socket mounted as volume.

$ docker run -v /var/run/docker.sock:/var/run/docker.sock cross
root@1e27ac2ed941:/# git clone https://github.com/cross-rs/cross
root@1e27ac2ed941:/# cd cross
root@1e27ac2ed941:/cross# cross build --target aarch64-unknown-linux-gnu

Although the README already describes how to achieve this, a provided Dockerfile that can be downloaded from Docker Hub in the best case would be much easier than writing your own. Especially when using a CI pipeline inside Docker, where creating a custom Dockerfile is not that easy, this could be a big help.
The directory of the Dockerfile may not be the best choice since only compile targets are in this directory but it was the best fit.

otavio · 2022-03-18T20:41:14Z

docker/Dockerfile.cross

+
+ENV CROSS_DOCKER_IN_DOCKER=true
+
+RUN wget -O- https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz | tar -C /usr/bin/ --strip-components=1 -xzf - docker/docker


We need to check signature or checksum here so we don't rely on the file being unmodified in future.

I don't think this is necessary.

It is not rare for tarball files to change behind the scene, so ensuring it is valid is a good security matter.

Is there a Docker image we can copy the binary from instead using a multi-stage build?

There is a docker in docker image but it has some other binaries which are not necessary and rust has to be installed manually which takes more steps than this multi-stage build.
The docker in docker image receives it binaries from download.docker.com (layer 6) just like here, so there is no big difference when using the docker in docker image (besides the unwanted binaries which it has).

bytedream · 2022-03-19T12:38:01Z

The checksum check is now implemented (md5) and it only checks the docker binary inside of the tarball since this is the only file which is needed.

reitermarkus · 2022-03-19T18:31:49Z

docker/Dockerfile.cross

+RUN wget -O- https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz | tar -C /usr/bin/ --strip-components=1 -xzf - docker/docker
+RUN echo $checksum | md5sum -c
+
+RUN cargo install cross


This should install the current version in this repository.

Emilgardis · 2022-03-20T12:18:56Z

docker/Dockerfile.cross

@@ -7,4 +7,4 @@ ARG checksum="d9d9b964d428733e98c2579b91772af4  /usr/bin/docker"
 RUN wget -O- https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz | tar -C /usr/bin/ --strip-components=1 -xzf - docker/docker
 RUN echo $checksum | md5sum -c

-RUN cargo install cross
+RUN cargo install --git https://github.com/cross-rs/cross


This is still wrong imo, I'd expect this to be built in our CI and published as ghcr.io/cross-rs/cross-in-docker (or similar).

it should also if anything use --locked

Yes, this needs to be something like

COPY . . RUN cargo install --path . --locked

…d to it

otavio · 2022-06-11T11:47:38Z

@bytedream could you rebase and add a changelog entry? So we could trigger CI and see if it'll succeed.

Emilgardis · 2022-06-11T11:50:38Z

docker/Dockerfile.cross-in-docker

+RUN wget -O- https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz | tar -C /usr/bin/ --strip-components=1 -xzf - docker/docker
+RUN echo $checksum | md5sum -c
+
+RUN cargo install --git https://github.com/cross-rs/cross


This is still wrong, it should copy from the checked out code, if this is kept the CI will work, but it'll check the most recent main branch changes, not the proposed changes

Sure, it should use the checkout for building, thanks @Emilgardis for raising this up.

Emilgardis

The image needs to be added

Emilgardis · 2022-06-11T11:56:31Z

.github/workflows/ci.yml

@@ -170,6 +170,8 @@ jobs:
            - { target: thumbv7em-none-eabi,              os: ubuntu-latest,                    std: 1 }
            - { target: thumbv7em-none-eabihf,            os: ubuntu-latest,                    std: 1 }
            - { target: thumbv7m-none-eabi,               os: ubuntu-latest,                    std: 1 }
+
+            - { target: cross                             os: ubuntu-latest }


This won't work either sadly, it'll have to be it's own task/action for the image to be built and published

This uses the official Docker docker-in-docker image for the latest stable, and installs the latest stable Rust version internally. It uses an entrypoint to ensure cargo is on the path, and that cross is installed from the latest git (locked), which when tagged will work well with our releases. It exports the environment variable `CROSS_CONTAINER_IN_CONTAINER` so everything should work as expected. Replaces cross-rs#667.

This uses the installs Docker from the official sources using the latest Ubuntu image stable, and installs the latest stable Rust version internally. Cross is installed from the latest git (locked), which when tagged will work well with our releases. It exports the environment variable `CROSS_CONTAINER_IN_CONTAINER` so everything should work as expected. Replaces cross-rs#667.

878: Add dockerfile for cross. r=Emilgardis a=Alexhuszagh This uses the official Docker docker-in-docker image for the latest stable, and installs the latest stable Rust version internally. It uses an entrypoint to ensure cargo is on the path, and that cross is installed from the latest git (locked), which when tagged will work well with our releases. It exports the environment variable `CROSS_CONTAINER_IN_CONTAINER` so everything should work as expected. Closes #468. Replaces #667. Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>

Alexhuszagh · 2022-07-05T18:42:49Z

Closed since #878 as merged.

add dockerfile for cross itself

45bdbaa

bytedream requested a review from a team as a code owner March 18, 2022 10:45

otavio requested changes Mar 18, 2022

View reviewed changes

bytedream added 2 commits March 19, 2022 13:31

add checksum check for docker binary

4c43cf6

re-changed FROM image to rust:latest

3203802

otavio previously approved these changes Mar 19, 2022

View reviewed changes

reitermarkus reviewed Mar 19, 2022

View reviewed changes

install cross from git instead of crates.io

b7d6c4f

bytedream dismissed otavio’s stale review via b7d6c4f March 20, 2022 09:52

Emilgardis requested changes Mar 20, 2022

View reviewed changes

bytedream added 2 commits March 20, 2022 15:02

rename Dockerfile.cross to Dockerfile.cross-in-docker and add --locke…

cc5e8f1

…d to it

add cross-in-docker target dockerfile

fb673cc

Alexhuszagh added enhancement container-images labels May 29, 2022

otavio added this to the v0.2.2 milestone Jun 11, 2022

Emilgardis removed this from the v0.2.2 milestone Jun 11, 2022

Emilgardis requested changes Jun 11, 2022

View reviewed changes

Merge branch 'cross-rs:main' into main

c93c307

Alexhuszagh mentioned this pull request Jun 27, 2022

Add dockerfile for cross. #878

Merged

Alexhuszagh closed this Jul 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add dockerfile for cross itself #667

Add dockerfile for cross itself #667

Uh oh!

bytedream commented Mar 18, 2022 •

edited

Loading

Uh oh!

otavio Mar 18, 2022

Uh oh!

Emilgardis Mar 18, 2022

Uh oh!

otavio Mar 18, 2022

Uh oh!

reitermarkus Mar 19, 2022

Uh oh!

bytedream Mar 20, 2022

Uh oh!

bytedream commented Mar 19, 2022

Uh oh!

reitermarkus Mar 19, 2022

Uh oh!

Emilgardis Mar 20, 2022 •

edited

Loading

Uh oh!

reitermarkus Mar 24, 2022

Uh oh!

otavio commented Jun 11, 2022

Uh oh!

Emilgardis Jun 11, 2022 •

edited

Loading

Uh oh!

otavio Jun 11, 2022

Uh oh!

Emilgardis left a comment

Uh oh!

Emilgardis Jun 11, 2022

Uh oh!

Alexhuszagh commented Jul 5, 2022

Uh oh!

Uh oh!


		ENV CROSS_DOCKER_IN_DOCKER=true

		RUN wget -O- https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz \| tar -C /usr/bin/ --strip-components=1 -xzf - docker/docker

Add dockerfile for cross itself #667

Add dockerfile for cross itself #667

Uh oh!

Conversation

bytedream commented Mar 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bytedream commented Mar 19, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Emilgardis Mar 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

otavio commented Jun 11, 2022

Uh oh!

Emilgardis Jun 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Emilgardis left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Alexhuszagh commented Jul 5, 2022

Uh oh!

Uh oh!

bytedream commented Mar 18, 2022 •

edited

Loading

Emilgardis Mar 20, 2022 •

edited

Loading

Emilgardis Jun 11, 2022 •

edited

Loading