Skip to content

L
lxc
Unverified Commit 68c084cb by Christian Brauner Committed by GitHub
Options

Merge pull request #2246 from flx42/lxc-oci-cmd-parsing-and-umoci

lxc-oci: cmd parsing and less verbose umoci
parents 5b66b6ee 845ba283
Showing with 3 additions and 3 deletions
templates/lxc-oci.in
...@@ -100,8 +100,8 @@ getep() { ...@@ -100,8 +100,8 @@ getep() {
configpath="$1" configpath="$1"
ep=$(jq -c -r '.config.Entrypoint[]?'< "${configpath}") ep=$(jq -c '.config.Entrypoint[]?'< "${configpath}" | tr '\n' ' ')
cmd=$(jq -c -r '.config.Cmd[]?' < "${configpath}") cmd=$(jq -c '.config.Cmd[]?'< "${configpath}" | tr '\n' ' ')
if [ -z "${ep}" ]; then if [ -z "${ep}" ]; then
ep="${cmd}" ep="${cmd}"
if [ -z "${ep}" ]; then if [ -z "${ep}" ]; then
...@@ -312,7 +312,7 @@ if [ -n "$LXC_MAPPED_UID" ] && [ "$LXC_MAPPED_UID" != "-1" ]; then ...@@ -312,7 +312,7 @@ if [ -n "$LXC_MAPPED_UID" ] && [ "$LXC_MAPPED_UID" != "-1" ]; then
fi fi
# shellcheck disable=SC2039 # shellcheck disable=SC2039
# shellcheck disable=SC2068 # shellcheck disable=SC2068
umoci unpack ${umoci_args[@]} --image "${DOWNLOAD_TEMP}:latest" "${LXC_ROOTFS}.tmp" umoci --log=error unpack ${umoci_args[@]} --image "${DOWNLOAD_TEMP}:latest" "${LXC_ROOTFS}.tmp"
rmdir "${LXC_ROOTFS}" rmdir "${LXC_ROOTFS}"
mv "${LXC_ROOTFS}.tmp/rootfs" "${LXC_ROOTFS}" mv "${LXC_ROOTFS}.tmp/rootfs" "${LXC_ROOTFS}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment