github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-02 02:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3147 from Bevisy/main-3144

Browse Source 
osbuilder: fix missing cpio package when building rootfs-initrd image
This commit is contained in:
Fabiano Fidêncio 2021-11-29 18:27:49 +01:00 committed by GitHub
commit f8aaefc919
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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))"

13
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,11 +27,12 @@ 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 \
gcc \ cpio \
git \ gcc \
make \ git \
xz-utils make \
xz-utils
ENV USER ${IMG_USER} ENV USER ${IMG_USER}
USER ${UID}:${GID} USER ${UID}:${GID}