github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-03 21:01:11 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder: fix missing cpio package when building rootfs-initrd image

Browse Source 
1. install cpio package before building rootfs-initrd image
2. add `pipefaili;errexit` check to the scripts

Fixes: #3144

Signed-off-by: Binbin Zhang <binbin36520@gmail.com>
This commit is contained in:
Binbin Zhang 2021-11-29 22:37:19 +08:00
parent 879ec4e0e9
commit 8ee67aae4f
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/osbuilder/image-builder/image_builder.sh
View File

@ -4,9 +4,11 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
set -e [ -z "${DEBUG}" ] || set -x
[ -n "${DEBUG}" ] && set -x set -o errexit
# set -o nounset
set -o pipefail
DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc} DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}

6
tools/osbuilder/initrd-builder/initrd_builder.sh
View File

@ -4,9 +4,11 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
set -e [ -z "${DEBUG}" ] || set -x
[ -n "$DEBUG" ] && set -x set -o errexit
# set -o nounset
set -o pipefail
script_name="${0##*/}" script_name="${0##*/}"
script_dir="$(dirname $(readlink -f $0))" script_dir="$(dirname $(readlink -f $0))"

5
tools/packaging/kata-deploy/local-build/dockerbuild/Dockerfile
View File

@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
FROM ubuntu FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV INSTALL_IN_GOPATH=false ENV INSTALL_IN_GOPATH=false
@ -27,7 +27,8 @@ RUN sh -c "echo '${IMG_USER} ALL=NOPASSWD: ALL' >> /etc/sudoers"
#FIXME: gcc is required as agent is build out of a container build. #FIXME: gcc is required as agent is build out of a container build.
RUN apt-get update && \ RUN apt-get update && \
apt install -y \ apt install --no-install-recommends -y \
cpio \
gcc \ gcc \
git \ git \
make \ make \