Update docker images to 0.4.16 (project-chip#3710)

Re-add JDK to chip-build. This is needed by VS code.
espressif · Nov 6, 2020 · 8ec5567 · 8ec5567
1 parent 69dcdb5
commit 8ec5567
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 15 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -13,7 +13,7 @@
         "dockerfile": "Dockerfile",
         "args": {
             //  "BUILD_VERSION": "$(cat integrations/docker/images/chip-build/version)" // trying to get this to work
-            "BUILD_VERSION": "0.4.11"
+            "BUILD_VERSION": "0.4.16"
         }
     },
     "remoteUser": "vscode",

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-android:0.4.13
+            image: connectedhomeip/chip-build-android:0.4.16
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -24,7 +24,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.12
+            image: connectedhomeip/chip-build:0.4.16
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.12
+            image: connectedhomeip/chip-build:0.4.16
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.4.11
+            image: connectedhomeip/chip-build-efr32:0.4.16
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.4.12
+            image: connectedhomeip/chip-build-esp32:0.4.16
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -31,7 +31,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.12
+            image: connectedhomeip/chip-build:0.4.16
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -27,7 +27,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.4.12
+            image: connectedhomeip/chip-build-nrf-platform:0.4.16
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

diff --git a/.github/workflows/examples-qpg6100.yaml b/.github/workflows/examples-qpg6100.yaml
@@ -27,7 +27,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.4.12
+            image: connectedhomeip/chip-build:0.4.16
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
@@ -28,7 +28,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.4.12
+            image: connectedhomeip/chip-build-esp32-qemu:0.4.16
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
@@ -34,7 +34,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-          image: connectedhomeip/chip-build:0.4.12
+          image: connectedhomeip/chip-build:0.4.16
           volumes:
               - "/tmp/log_output:/tmp/test_logs"
               - "/tmp/happy_test_logs:/tmp/happy_test_logs"

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-cirque/version b/integrations/docker/images/chip-build-cirque/version
diff --git a/integrations/docker/images/chip-build-cirque/version b/integrations/docker/images/chip-build-cirque/version
@@ -0,0 +1 @@
+../chip-build/version
diff --git a/integrations/docker/images/chip-build/Dockerfile b/integrations/docker/images/chip-build/Dockerfile
@@ -48,6 +48,7 @@ RUN set -x \
     make \
     net-tools \
     ninja-build \
+    openjdk-8-jdk \
     pkg-config \
     python3 \
     python3-dev \

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.4.14
+0.4.16
diff --git a/src/test_driver/happy/README.md b/src/test_driver/happy/README.md
@@ -18,7 +18,7 @@
               --entrypoint /bin/bash \
               --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" \
               -it --mount type=bind,source=`pwd`,target=`pwd` \
-              connectedhomeip/chip-build:0.4.11
+              connectedhomeip/chip-build:0.4.16
 
     Mount your checkout to the same path as your local path avoids errors during
     bootstrap.