From aa1f253a8a2acdade4958544df3da3090e0a4389 Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Mon, 29 Apr 2024 12:21:47 -0400
Subject: [PATCH 1/3] Force a rebuild using the latest sources

---
 Docker/yocto/Dockerfile      | 4 +++-
 Docker/yocto/buildAndPush.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Docker/yocto/Dockerfile b/Docker/yocto/Dockerfile
index 2da676932..87f786716 100644
--- a/Docker/yocto/Dockerfile
+++ b/Docker/yocto/Dockerfile
@@ -19,7 +19,9 @@ WORKDIR /opt/poky
 ARG YOCTO_VERSION=kirkstone
 RUN git checkout -t origin/${YOCTO_VERSION} -b ${YOCTO_VERSION} && git pull
 
-RUN git clone --single-branch --branch=master https://github.com/wolfssl/meta-wolfssl.git && \
+# This arg is to be able to force a rebuild starting from this line
+ARG DUMMY=date
+RUN DUMMY=${DUMMY} git clone --single-branch --branch=master https://github.com/wolfssl/meta-wolfssl.git && \
     /bin/bash -c "source oe-init-build-env" && \
     echo 'IMAGE_INSTALL:append = " wolfssl wolfclu wolfssh wolfmqtt wolftpm wolfclu "' >> /opt/poky/build/conf/local.conf && \
     sed -i '/\/opt\/poky\/meta-poky \\/a \\t/opt/poky/meta-wolfssl \\' /opt/poky/build/conf/bblayers.conf
diff --git a/Docker/yocto/buildAndPush.sh b/Docker/yocto/buildAndPush.sh
index d76a603e8..3a4ec6110 100755
--- a/Docker/yocto/buildAndPush.sh
+++ b/Docker/yocto/buildAndPush.sh
@@ -13,7 +13,7 @@ NUM_FAILURES=0
 CUR_DATE=$(date -u +%F)
 for ver in kirkstone dunfell; do
     echo "Building wolfssl/yocto:${ver}-${CUR_DATE} as ${DOCKER_BUILD_OPTIONS}"
-    docker build -t wolfssl/yocto:${ver}-${CUR_DATE} --build-arg YOCTO_VERSION=${ver} -f Dockerfile "${WOLFSSL_DIR}/Docker/yocto" && \
+    docker build -t wolfssl/yocto:${ver}-${CUR_DATE} --build-arg YOCTO_VERSION=${ver} --build-arg BUILD_DATE=${CUR_DATE} -f Dockerfile "${WOLFSSL_DIR}/Docker/yocto" && \
         docker tag wolfssl/yocto:${ver}-${CUR_DATE} wolfssl/yocto:${ver}-latest
     if [ $? -eq 0 ]; then
         echo "Pushing containers to DockerHub"

From 13f83045a4a43f59dac8df52de6e31f9f9bb7b65 Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Mon, 29 Apr 2024 12:22:54 -0400
Subject: [PATCH 2/3] Add in 'langdale' and 'scarthgap' containers

---
 Docker/yocto/buildAndPush.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docker/yocto/buildAndPush.sh b/Docker/yocto/buildAndPush.sh
index 3a4ec6110..6bcb2d66b 100755
--- a/Docker/yocto/buildAndPush.sh
+++ b/Docker/yocto/buildAndPush.sh
@@ -11,7 +11,7 @@ fi
 NUM_FAILURES=0
 
 CUR_DATE=$(date -u +%F)
-for ver in kirkstone dunfell; do
+for ver in kirkstone dunfell langdale scarthgap; do
     echo "Building wolfssl/yocto:${ver}-${CUR_DATE} as ${DOCKER_BUILD_OPTIONS}"
     docker build -t wolfssl/yocto:${ver}-${CUR_DATE} --build-arg YOCTO_VERSION=${ver} --build-arg BUILD_DATE=${CUR_DATE} -f Dockerfile "${WOLFSSL_DIR}/Docker/yocto" && \
         docker tag wolfssl/yocto:${ver}-${CUR_DATE} wolfssl/yocto:${ver}-latest

From b90035d7b007b467e718a18ea870c00798ca51aa Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Mon, 29 Apr 2024 12:26:29 -0400
Subject: [PATCH 3/3] Remove 'dunfell' as its support ends in 3 days

---
 Docker/yocto/buildAndPush.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docker/yocto/buildAndPush.sh b/Docker/yocto/buildAndPush.sh
index 6bcb2d66b..8c749502c 100755
--- a/Docker/yocto/buildAndPush.sh
+++ b/Docker/yocto/buildAndPush.sh
@@ -11,7 +11,7 @@ fi
 NUM_FAILURES=0
 
 CUR_DATE=$(date -u +%F)
-for ver in kirkstone dunfell langdale scarthgap; do
+for ver in kirkstone langdale scarthgap; do
     echo "Building wolfssl/yocto:${ver}-${CUR_DATE} as ${DOCKER_BUILD_OPTIONS}"
     docker build -t wolfssl/yocto:${ver}-${CUR_DATE} --build-arg YOCTO_VERSION=${ver} --build-arg BUILD_DATE=${CUR_DATE} -f Dockerfile "${WOLFSSL_DIR}/Docker/yocto" && \
         docker tag wolfssl/yocto:${ver}-${CUR_DATE} wolfssl/yocto:${ver}-latest