3 files changed, 14 insertions, 11 deletions

diff --git a/recipes-demo/helloworld-flask/helloworld-flask_0.1.bb b/recipes-demo/helloworld-flask/helloworld-flask_0.1.bb
index 896e45fd..043ccc52 100644
--- a/recipes-demo/helloworld-flask/helloworld-flask_0.1.bb
+++ b/recipes-demo/helloworld-flask/helloworld-flask_0.1.bb
@@ -16,23 +16,26 @@ CONTAINERIMAGE ?= "zeddii/app-container:latest"
 CONTAINERPORT ?= "9000"
 EXTERNALPORT ?= "10000"
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_install() {
 
     for tgt in flask-app.yaml flask-app-service.yaml; do
-        sed -i 's%\@NAME\@%${NAME}%g' ${WORKDIR}/$tgt
-        sed -i 's%\@APPNAME\@%${APPNAME}%g' ${WORKDIR}/$tgt
-        sed -i 's%\@CONTAINERNAME\@%${CONTAINERNAME}%g' ${WORKDIR}/$tgt
-        sed -i 's%\@CONTAINERIMAGE\@%${CONTAINERIMAGE}%g' ${WORKDIR}/$tgt
-        sed -i 's%\@CONTAINERPORT\@%${CONTAINERPORT}%g' ${WORKDIR}/$tgt
-        sed -i 's%\@EXTERNALPORT\@%${EXTERNALPORT}%g' ${WORKDIR}/$tgt
+        sed -i 's%\@NAME\@%${NAME}%g' ${UNPACKDIR}/$tgt
+        sed -i 's%\@APPNAME\@%${APPNAME}%g' ${UNPACKDIR}/$tgt
+        sed -i 's%\@CONTAINERNAME\@%${CONTAINERNAME}%g' ${UNPACKDIR}/$tgt
+        sed -i 's%\@CONTAINERIMAGE\@%${CONTAINERIMAGE}%g' ${UNPACKDIR}/$tgt
+        sed -i 's%\@CONTAINERPORT\@%${CONTAINERPORT}%g' ${UNPACKDIR}/$tgt
+        sed -i 's%\@EXTERNALPORT\@%${EXTERNALPORT}%g' ${UNPACKDIR}/$tgt
     done
     
     install -d ${D}${bindir}/
-    install -m 755 ${WORKDIR}/flask-app ${D}${bindir}/
+    install -m 755 ${UNPACKDIR}/flask-app ${D}${bindir}/
 
     install -d ${D}${sysconfdir}/deploy
-    install -m 644 ${WORKDIR}/flask-app.yaml ${D}${sysconfdir}/
-    install -m 644 ${WORKDIR}/flask-app-service.yaml ${D}${sysconfdir}/
+    install -m 644 ${UNPACKDIR}/flask-app.yaml ${D}${sysconfdir}/
+    install -m 644 ${UNPACKDIR}/flask-app-service.yaml ${D}${sysconfdir}/
 }
 
 RDEPENDS:${PN} += "python3-core python3-flask"
diff --git a/recipes-demo/images/app-container-curl.bb b/recipes-demo/images/app-container-curl.bb
index 51451300..ddeb3022 100644
--- a/recipes-demo/images/app-container-curl.bb
+++ b/recipes-demo/images/app-container-curl.bb
@@ -43,4 +43,4 @@ OCI_IMAGE_TAG = "easy"
 OCI_IMAGE_ENTRYPOINT_ARGS = "http://localhost:80"
 CONTAINER_SHELL = "busybox"
 
-IMAGE_INSTALL:append = "curl"
+IMAGE_INSTALL:append = " curl"
diff --git a/recipes-demo/images/app-container.bb b/recipes-demo/images/app-container.bb
index 22d2ab9f..8188d57a 100644
--- a/recipes-demo/images/app-container.bb
+++ b/recipes-demo/images/app-container.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 OCI_IMAGE_ENTRYPOINT = "/usr/bin/flask-app"
 CONTAINER_SHELL = "busybox"
 
-IMAGE_INSTALL:append = "helloworld-flask"
+IMAGE_INSTALL:append = " helloworld-flask"
 
 IMAGE_FSTYPES = "container oci"
 inherit image