From 48b0f873c55abe951f2d0a1ce6e325962b5807f4 Mon Sep 17 00:00:00 2001
From: Shubham Patil <shubham.patil@espressif.com>
Date: Fri, 21 Jun 2024 11:41:42 +0530
Subject: [PATCH] tools/docker: Fix building docker image and dir restructuring

---
 .github/workflows/docker-image.yml                       | 3 +--
 tools/docker/{matter-builds => matter_builds/Dockerfile} | 6 +++++-
 tools/docker/{ => matter_builds}/entrypoint.sh           | 0
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename tools/docker/{matter-builds => matter_builds/Dockerfile} (87%)
 rename tools/docker/{ => matter_builds}/entrypoint.sh (100%)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index aecc34696..29a3c444f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -76,8 +76,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          context: tools/docker
-          file: tools/docker/matter-builds
+          context: tools/docker/matter_builds
           push: true
           tags: |
             ${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }}
diff --git a/tools/docker/matter-builds b/tools/docker/matter_builds/Dockerfile
similarity index 87%
rename from tools/docker/matter-builds
rename to tools/docker/matter_builds/Dockerfile
index daae6a028..7054e8ec1 100644
--- a/tools/docker/matter-builds
+++ b/tools/docker/matter_builds/Dockerfile
@@ -1,4 +1,8 @@
-ARG VERSION=latest
+# The chip-build image is moved to Ubuntu 24.04 for Matter v1.4 onwards.
+# For Matter v1.3 and earlier, it uses Ubuntu 22.04.
+# Therefore, pinning this to version:54 for building Docker images.
+# TODO: Move to latest when updating submodule
+ARG VERSION=54
 FROM ghcr.io/project-chip/chip-build:${VERSION} as build
 
 # Use IDF_CHECKOUT_REF to specify a tag, a branch or a specific commit ID.
diff --git a/tools/docker/entrypoint.sh b/tools/docker/matter_builds/entrypoint.sh
similarity index 100%
rename from tools/docker/entrypoint.sh
rename to tools/docker/matter_builds/entrypoint.sh