summary refs log tree commit diff
path: root/docker/Dockerfile
Commit message (Collapse)AuthorAge
* docker: update to rust 1.42 and rustup 1.21.1Daniel Verkamp2020-04-18
| | | | | | | | | | | | | | | | | | | | | | Update to the latest rustup release, which (since 1.20.0) installs rustfmt and clippy by default: https://blog.rust-lang.org/2019/10/15/Rustup-1.20.0.html Also update the Rust toolchain version to 1.42.0 to match the version in the CrOS build environment. Additionally, add workarounds for sysroot of cargo clippy. BUG=None TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh TEST=bin/clippy on workstation Change-Id: I7ac4db92f4e5f277d77a77fa3c4ffa880f2ae116 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2150988 Tested-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
* docker: Put libvda.pc under /pkgconfig/Keiichi Watanabe2020-04-17
| | | | | | | | | | | | | | | | | Put a dummy pc file for libvda under /docker/pkgconfig/ instead of generating at the runtime. This is a fix for CL:2133987, but shouldn't change any behavior. BUG=none TEST=build_crosvm_base.sh && build_crosvm.sh with CL:1973973 Change-Id: Ifd7677abf14346ca2e7a9bc48b5ebb6c519b78aa Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2145533 Tested-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
* docker: Add setup for libvdaKeiichi Watanabe2020-04-04
| | | | | | | | | | | | | | | | | | | Add the following setup for libvda, which will be used by video features introduced by CL:1973973: * Pull down platform2 as /platform2 * Create a dummpy libvda.pc file Note that we don't build libvda.so. BUG=b:147465619 TEST=build_crosvm.sh Change-Id: I1f61df57244a13b7df1b7a373d955b6cfe91e188 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2133987 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
* docker: check out minijail in expected locationDaniel Verkamp2020-02-19
| | | | | | | | | | | | | | | | | | | Move the minijail source checkout location in the Dockerfile so that it is in the expected place relative to the crosvm checkout so that Docker (and kokoro) can successfully find it. Also update Cargo.lock for the new minijail-sys dependency; this fixes "read-only filesystem" errors from cargo running inside Docker when it tries to write the updated Cargo.lock. BUG=None TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh Change-Id: Ic399030004c2c4891a03a60474348b0bed9f01d7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2062675 Reviewed-by: Dylan Reid <dgreid@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Tested-by: Daniel Verkamp <dverkamp@chromium.org>
* docker: upgrade rustc to 1.41.0Daniel Verkamp2020-02-13
| | | | | | | | | | | BUG=chromium:1050853 TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh Change-Id: Id98a05c6ca01c9220e692cefc1a2c1d9eca50834 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2049243 Reviewed-by: Stephen Barber <smbarber@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Tested-by: Daniel Verkamp <dverkamp@chromium.org>
* docker: upgrade to Rust 1.38.0Daniel Verkamp2019-10-30
| | | | | | | | | | | BUG=None TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh Change-Id: I3987db0b989105b5ecca41ac2973324374fa5db0 Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1863001 Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
* docker: fix minigbm failure when building base imageJianxun Zhang2019-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Running ./build_crosvm_base.sh failed with the below error: ... /scratch/minigbm/helpers.c: In function 'layout_from_format': /scratch/minigbm/helpers.c:156:7: error: \ 'DRM_FORMAT_ABGR16161616F' undeclared (first use in this function) case DRM_FORMAT_ABGR16161616F: ... The header file in the libdrm-dev package from debian distro hasn't included the missed macro. This change builds libdrm from the upstream source to fix the issue. BUG=None TEST=./build_crosvm_base.sh echo $? Change-Id: Ifaae4313781ea02ebac9658ab8be9d990a3d5d25 Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1841890 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
* docker: make using X11 gpu display easier with dockerZach Reizner2019-08-28
| | | | | | | | | | | | | | | | | This change makes using docker a bit easier when displaying on the hosts X11 server. The biggest change was that build_crosvm.sh will install the hosts NVIDIA proprietary driver if needed. TEST=docker/build_crosvm.sh docker/crosvm_wrapper.sh BUG=None Change-Id: If64074715b0ad3a06727a4cc764d3ac06c4dfece Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1759139 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Tested-by: Zach Reizner <zachr@chromium.org> Commit-Queue: Zach Reizner <zachr@chromium.org>
* Dockerfile: stop tracking virglrenderer masterGurchetan Singh2019-08-20
| | | | | | | | | | | | | | | | | | With crrev.com/c/1745316, the regular ChromeOS build started adding epatches to virglrenderer. Therefore, don't track virglrenderer master for the time being, until we can upstream and/or remove our downstream APIs. BUG=chromium:906811 TEST=docker/wrapped_smoke_test.sh Change-Id: I9567e9286130048fb793fecb4ff3801b7d64ddba Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1758371 Tested-by: Gurchetan Singh <gurchetansingh@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org> Reviewed-by: David Riley <davidriley@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
* rust-toolchain: upgrade to Rust 1.36.0Daniel Verkamp2019-07-30
| | | | | | | | | | | | | | Update the rust-toolchain file and Docker image used in kokoro to match the Chrome OS toolchain. BUG=None TEST=docker/wrapped_smoke_test.sh Change-Id: I95cbf9bcaadd49b8476f2829bc75958dbea304e3 Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1724850 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Zach Reizner <zachr@chromium.org>
* docker: add adhd to checkout_commits.env and update all commitsZach Reizner2019-06-04
| | | | | | | | | | | | | | | | | | This change also includes some code that was missing from upgrade_checkout_commits.sh that actually generated the new checkout_commits.env. BUG=None TEST=kokoro/kokoro_simulator.sh docker/build_crosvm_base.sh docker/build_crosvm.sh Change-Id: If2505dd9af060d15c36eaf54741d4ae371f6a3c7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1641585 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Tested-by: Zach Reizner <zachr@chromium.org> Commit-Queue: Zach Reizner <zachr@chromium.org>
* rust-toolchain: upgrade to Rust 1.35.0Daniel Verkamp2019-05-30
| | | | | | | | | | | BUG=None TEST=docker/wrapped_smoke_test.sh Change-Id: I0a159d9b54d97098d633ce80b92eeb48eb5c4b55 Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1632036 Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
* add docker supported builds and testsZach Reizner2019-05-15
BUG=None TEST=docker/build_crosvm_base.sh docker/build_crosvm.sh docker/wrapped_smoke_test.sh docker/crosvm_wrapper.sh kokoro/kokoro_simulator.sh bin/smoke_test Change-Id: I55a805ba6326c3c58973d1fe21172a5e3551c1e2 Reviewed-on: https://chromium-review.googlesource.com/1593723 Commit-Ready: Zach Reizner <zachr@chromium.org> Tested-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Dylan Reid <dgreid@chromium.org>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-18 14:35:17 +0000