@@ -1925,37 +1925,78 @@
"shortname" : "Build 'base' multiarch container",
"BBTARGETS" : "container-image-multiarch-container-base",
"CONTAINER_IMAGE_MAP" : {"container-image-multiarch-container-base": "base"},
- "CONTAINER_VERSION_RECIPE" : "base-files"
+ "CONTAINER_VERSION_RECIPE" : "base-files",
+ "extravars" : ["PACKAGE_EXTRA_ARCHS:append = ' container-dummy-provides'"]
},
"step3" : {
"shortname" : "Build 'curl' multiarch container",
"BBTARGETS" : "container-image-multiarch-app-container-curl",
"CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-curl": "curl"},
- "CONTAINER_VERSION_RECIPE" : "curl"
+ "CONTAINER_VERSION_RECIPE" : "curl",
+ "extravars" : ["PACKAGE_EXTRA_ARCHS:append = ' container-dummy-provides'"]
},
"step4" : {
+ "shortname" : "Build 'curl' multiarch container (dev)",
+ "BBTARGETS" : "container-image-multiarch-app-container-curl",
+ "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-curl": "curl"},
+ "CONTAINER_VERSION_RECIPE" : "curl",
+ "extravars" : ["PACKAGECONFIG:pn-app-container-curl = 'dev'"]
+ },
+ "step5" : {
"shortname" : "Build 'python' container",
"BBTARGETS" : "container-image-multiarch-app-container-python",
"CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-python": "python"},
- "CONTAINER_VERSION_RECIPE" : "python3"
+ "CONTAINER_VERSION_RECIPE" : "python3",
+ "extravars" : ["PACKAGE_EXTRA_ARCHS:append = ' container-dummy-provides'"]
},
- "step5" : {
+ "step6" : {
+ "shortname" : "Build 'python' container (dev)",
+ "BBTARGETS" : "container-image-multiarch-app-container-python",
+ "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-python": "python"},
+ "CONTAINER_VERSION_RECIPE" : "python3",
+ "extravars" : ["PACKAGECONFIG:pn-app-container-python = 'dev'"]
+ },
+ "step7" : {
"shortname" : "Build 'mosquitto' container",
"BBTARGETS" : "container-image-multiarch-app-container-mosquitto",
"CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-mosquitto": "mosquitto"},
- "CONTAINER_VERSION_RECIPE" : "mosquitto"
+ "CONTAINER_VERSION_RECIPE" : "mosquitto",
+ "extravars" : ["PACKAGE_EXTRA_ARCHS:append = ' container-dummy-provides'"]
},
- "step6" : {
+ "step8" : {
+ "shortname" : "Build 'mosquitto' container (dev)",
+ "BBTARGETS" : "container-image-multiarch-app-container-mosquitto",
+ "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-mosquitto": "mosquitto"},
+ "CONTAINER_VERSION_RECIPE" : "mosquitto",
+ "extravars" : ["PACKAGECONFIG:pn-app-container-mosquitto = 'dev'"]
+ },
+ "step9" : {
"shortname" : "Build 'valkey' container",
"BBTARGETS" : "container-image-multiarch-app-container-valkey",
"CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-valkey": "valkey"},
- "CONTAINER_VERSION_RECIPE" : "valkey"
+ "CONTAINER_VERSION_RECIPE" : "valkey",
+ "extravars" : ["PACKAGE_EXTRA_ARCHS:append = ' container-dummy-provides'"]
},
- "step7" : {
+ "step10" : {
+ "shortname" : "Build 'valkey' container (dev)",
+ "BBTARGETS" : "container-image-multiarch-app-container-valkey",
+ "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-valkey": "valkey"},
+ "CONTAINER_VERSION_RECIPE" : "valkey",
+ "extravars" : ["PACKAGECONFIG:pn-app-container-valkey = 'dev'"]
+ },
+ "step11" : {
"shortname" : "Build 'nginx' container",
"BBTARGETS" : "container-image-multiarch-app-container-nginx",
"CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-nginx": "nginx"},
- "CONTAINER_VERSION_RECIPE" : "nginx"
+ "CONTAINER_VERSION_RECIPE" : "nginx",
+ "extravars" : ["PACKAGE_EXTRA_ARCHS:append = ' container-dummy-provides'"]
+ },
+ "step12" : {
+ "shortname" : "Build 'nginx' container (dev)",
+ "BBTARGETS" : "container-image-multiarch-app-container-nginx",
+ "CONTAINER_IMAGE_MAP" : {"container-image-multiarch-app-container-nginx": "nginx"},
+ "CONTAINER_VERSION_RECIPE" : "nginx",
+ "extravars" : ["PACKAGECONFIG:pn-app-container-nginx = 'dev'"]
}
}
},
For some of the containers, we want to provide a -dev version, denoted by '-dev' appended to the tag(s). This runs the container as UID '0' root user and adds a shell. Inspired by dhi.io (Docker Hardened Images). Signed-off-by: Tim Orling <tim.orling@konsulko.com> --- config.json | 59 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 9 deletions(-)