mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-05-09 17:07:33 +00:00
Merge pull request #9863 from wainersm/kata-deploy_yq
kata-deploy: always copy ci/install_yq.sh
This commit is contained in:
commit
36093e86e0
tools/packaging/kata-deploy/local-build
@ -56,13 +56,10 @@ endef
|
||||
|
||||
kata-tarball: | all-parallel merge-builds
|
||||
|
||||
$(MK_DIR)/dockerbuild/install_yq.sh:
|
||||
$(MK_DIR)/kata-deploy-copy-yq-installer.sh
|
||||
|
||||
copy-scripts-for-the-agent-build:
|
||||
${MK_DIR}/kata-deploy-copy-libseccomp-installer.sh
|
||||
|
||||
all-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
|
||||
all-parallel:
|
||||
${MAKE} -f $(MK_PATH) all -j $(shell nproc ${CI:+--ignore 1}) V=
|
||||
|
||||
all: ${BASE_TARBALLS}
|
||||
@ -71,7 +68,7 @@ serial-targets:
|
||||
${MAKE} -f $(MK_PATH) -j 1 V= \
|
||||
${BASE_SERIAL_TARBALLS}
|
||||
|
||||
%-tarball-build: $(MK_DIR)/dockerbuild/install_yq.sh
|
||||
%-tarball-build:
|
||||
$(call BUILD,$*)
|
||||
|
||||
agent-tarball: copy-scripts-for-the-agent-build
|
||||
|
@ -68,6 +68,7 @@ if [ ! -d "$HOME/.docker" ]; then
|
||||
remove_dot_docker_dir=true
|
||||
fi
|
||||
|
||||
"${script_dir}"/kata-deploy-copy-yq-installer.sh
|
||||
docker build -q -t build-kata-deploy \
|
||||
--build-arg IMG_USER="${USER}" \
|
||||
--build-arg UID=${uid} \
|
||||
|
Loading…
Reference in New Issue
Block a user