diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2022-07-12 14:26:45 +0200 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-07-15 17:14:57 -0400 |
commit | 064a96fe1b3618370408c7a784abf035f0d56934 (patch) | |
tree | bbd66f1f20f29f6b0f3d0df42b82e0b1ea2f3960 /classes | |
parent | 21cd0c24e35ca055c96f38b06a872633b5230f6f (diff) | |
download | meta-virtualization-064a96fe1b3618370408c7a784abf035f0d56934.tar.gz |
image-oci-umoci: properly handle tags other than latest
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image-oci-umoci.inc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/classes/image-oci-umoci.inc b/classes/image-oci-umoci.inc index 4fe96ea0..b159614f 100644 --- a/classes/image-oci-umoci.inc +++ b/classes/image-oci-umoci.inc | |||
@@ -58,48 +58,48 @@ IMAGE_CMD:oci() { | |||
58 | bbdebug 1 "OCI: configuring image" | 58 | bbdebug 1 "OCI: configuring image" |
59 | if [ -n "${OCI_IMAGE_LABELS}" ]; then | 59 | if [ -n "${OCI_IMAGE_LABELS}" ]; then |
60 | for l in ${OCI_IMAGE_LABELS}; do | 60 | for l in ${OCI_IMAGE_LABELS}; do |
61 | bbdebug 1 "OCI: umoci config --image $image_name --config.label $l" | 61 | bbdebug 1 "OCI: umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label $l" |
62 | umoci config --image $image_name --config.label $l | 62 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label $l |
63 | done | 63 | done |
64 | fi | 64 | fi |
65 | if [ -n "${OCI_IMAGE_ENV_VARS}" ]; then | 65 | if [ -n "${OCI_IMAGE_ENV_VARS}" ]; then |
66 | for l in ${OCI_IMAGE_ENV_VARS}; do | 66 | for l in ${OCI_IMAGE_ENV_VARS}; do |
67 | bbdebug 1 "umoci config --image $image_name --config.env $l" | 67 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --config.env $l" |
68 | umoci config --image $image_name --config.env $l | 68 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.env $l |
69 | done | 69 | done |
70 | fi | 70 | fi |
71 | if [ -n "${OCI_IMAGE_PORTS}" ]; then | 71 | if [ -n "${OCI_IMAGE_PORTS}" ]; then |
72 | for l in ${OCI_IMAGE_PORTS}; do | 72 | for l in ${OCI_IMAGE_PORTS}; do |
73 | bbdebug 1 "umoci config --image $image_name --config.exposedports $l" | 73 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --config.exposedports $l" |
74 | umoci config --image $image_name --config.exposedports $l | 74 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.exposedports $l |
75 | done | 75 | done |
76 | fi | 76 | fi |
77 | if [ -n "${OCI_IMAGE_RUNTIME_UID}" ]; then | 77 | if [ -n "${OCI_IMAGE_RUNTIME_UID}" ]; then |
78 | bbdebug 1 "umoci config --image $image_name --config.user ${OCI_IMAGE_RUNTIME_UID}" | 78 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --config.user ${OCI_IMAGE_RUNTIME_UID}" |
79 | umoci config --image $image_name --config.user ${OCI_IMAGE_RUNTIME_UID} | 79 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.user ${OCI_IMAGE_RUNTIME_UID} |
80 | fi | 80 | fi |
81 | if [ -n "${OCI_IMAGE_WORKINGDIR}" ]; then | 81 | if [ -n "${OCI_IMAGE_WORKINGDIR}" ]; then |
82 | bbdebug 1 "umoci config --image $image_name --config.workingdir ${OCI_IMAGE_WORKINGDIR}" | 82 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --config.workingdir ${OCI_IMAGE_WORKINGDIR}" |
83 | umoci config --image $image_name --config.workingdir ${OCI_IMAGE_WORKINGDIR} | 83 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.workingdir ${OCI_IMAGE_WORKINGDIR} |
84 | fi | 84 | fi |
85 | if [ -n "${OCI_IMAGE_OS}" ]; then | 85 | if [ -n "${OCI_IMAGE_OS}" ]; then |
86 | bbdebug 1 "umoci config --image $image_name --os ${OCI_IMAGE_OS}" | 86 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --os ${OCI_IMAGE_OS}" |
87 | umoci config --image $image_name --os ${OCI_IMAGE_OS} | 87 | umoci config --image $image_name:${OCI_IMAGE_TAG} --os ${OCI_IMAGE_OS} |
88 | fi | 88 | fi |
89 | 89 | ||
90 | bbdebug 1 "umoci config --image $image_name --architecture ${OCI_IMAGE_ARCH}" | 90 | bbdebug 1 "umoci config --image $image_name:${OCI_IMAGE_TAG} --architecture ${OCI_IMAGE_ARCH}" |
91 | umoci config --image $image_name --architecture ${OCI_IMAGE_ARCH} | 91 | umoci config --image $image_name:${OCI_IMAGE_TAG} --architecture ${OCI_IMAGE_ARCH} |
92 | # NOTE: umoci doesn't currently expose setting the architecture variant, | 92 | # NOTE: umoci doesn't currently expose setting the architecture variant, |
93 | # so if you need it use sloci instead | 93 | # so if you need it use sloci instead |
94 | if [ -n "${OCI_IMAGE_SUBARCH}" ]; then | 94 | if [ -n "${OCI_IMAGE_SUBARCH}" ]; then |
95 | bbnote "OCI: image subarch is set to: ${OCI_IMAGE_SUBARCH}, but umoci does not" | 95 | bbnote "OCI: image subarch is set to: ${OCI_IMAGE_SUBARCH}, but umoci does not" |
96 | bbnote " expose variants. use sloci instead if this is important" | 96 | bbnote " expose variants. use sloci instead if this is important" |
97 | fi | 97 | fi |
98 | umoci config --image $image_name --config.entrypoint ${OCI_IMAGE_ENTRYPOINT} | 98 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.entrypoint ${OCI_IMAGE_ENTRYPOINT} |
99 | if [ -n "${OCI_IMAGE_ENTRYPOINT_ARGS}" ]; then | 99 | if [ -n "${OCI_IMAGE_ENTRYPOINT_ARGS}" ]; then |
100 | umoci config --image $image_name --config.cmd "${OCI_IMAGE_ENTRYPOINT_ARGS}" | 100 | umoci config --image $image_name:${OCI_IMAGE_TAG} --config.cmd "${OCI_IMAGE_ENTRYPOINT_ARGS}" |
101 | fi | 101 | fi |
102 | umoci config --image $image_name --author ${OCI_IMAGE_AUTHOR_EMAIL} | 102 | umoci config --image $image_name:${OCI_IMAGE_TAG} --author ${OCI_IMAGE_AUTHOR_EMAIL} |
103 | 103 | ||
104 | # make a tar version of the image direcotry | 104 | # make a tar version of the image direcotry |
105 | if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then | 105 | if [ -n "${OCI_IMAGE_TAR_OUTPUT}" ]; then |