diff options
| author | Zach Reizner <zachr@google.com> | 2019-06-03 11:15:38 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-04 00:46:18 +0000 |
| commit | 6a0bfb037a109030b69feb9dec4a546548636940 (patch) | |
| tree | 2589f53e14269d60c0de77a5bff4736e2e77f951 /docker/Dockerfile | |
| parent | 6d1ab5094375afb653d9955fe7ccb818eca48665 (diff) | |
| download | crosvm-6a0bfb037a109030b69feb9dec4a546548636940.tar crosvm-6a0bfb037a109030b69feb9dec4a546548636940.tar.gz crosvm-6a0bfb037a109030b69feb9dec4a546548636940.tar.bz2 crosvm-6a0bfb037a109030b69feb9dec4a546548636940.tar.lz crosvm-6a0bfb037a109030b69feb9dec4a546548636940.tar.xz crosvm-6a0bfb037a109030b69feb9dec4a546548636940.tar.zst crosvm-6a0bfb037a109030b69feb9dec4a546548636940.zip | |
docker: add adhd to checkout_commits.env and update all commits
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>
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d882d22..dea2fc4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -137,7 +137,10 @@ ENV PLATFORM_ROOT=$CROS_ROOT/platform RUN mkdir -p $PLATFORM_ROOT # Pull the cras library for audio access. -RUN git clone https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd +ARG ADHD_COMMIT=master +RUN git clone https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd \ + && cd $THIRD_PARTY_ROOT/adhd \ + && git checkout $ADHD_COMMIT # The /build directory is used so that the bind mounted /platform/crosvm volume # does not get scribbled on. |