Update version for android image, fix dpkg install error in nrf conne…

…ct image (project-chip#1561)
kedars · Jul 19, 2020 · 48991c7 · 48991c7
1 parent 8f2029f
commit 48991c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/integrations/docker/images/chip-build-android/version b/integrations/docker/images/chip-build-android/version
diff --git a/integrations/docker/images/chip-build-android/version b/integrations/docker/images/chip-build-android/version
@@ -0,0 +1 @@
+../chip-build/version
diff --git a/integrations/docker/images/chip-build-nrfconnect-platform/Dockerfile b/integrations/docker/images/chip-build-nrfconnect-platform/Dockerfile
@@ -11,8 +11,8 @@ RUN set -x \
     # nRF Tools for flashing software on Nordic devices, and accessing device logs
     && wget -qO- https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF-command-line-tools/sw/Versions-10-x-x/10-7-0/nRFCommandLineTools1070Linuxamd64tar.gz \
         | tar xz -C /tmp \
-    && dpkg -i /tmp/JLink_Linux_*.deb \
-    && dpkg -i /tmp/nRF-Command-Line-Tools_*.deb \
+    && dpkg -i --force-depends /tmp/JLink_Linux_*.deb \
+    && dpkg -i --force-depends /tmp/nRF-Command-Line-Tools_*.deb \
     # nRF Connect SDK dependencies
     && pip3 install --no-cache-dir setuptools wheel cmake west pyyaml \
     # nRF Connect SDK 1.3.0 sources & requirements