mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-09 11:58:16 +00:00
Merge pull request #5323 from fidencio/topic/fix-kata-deploy-build-behind-proxy
packaging: Mount $HOME/.docker in the 1st layer container
This commit is contained in:
commit
ff62cedd26
@ -31,6 +31,12 @@ if [ ${docker_gid} == ${gid} ]; then
|
|||||||
docker_gid=""
|
docker_gid=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
remove_dot_docker_dir=false
|
||||||
|
if [ ! -d "$HOME/.docker" ]; then
|
||||||
|
mkdir $HOME/.docker
|
||||||
|
remove_dot_docker_dir=true
|
||||||
|
fi
|
||||||
|
|
||||||
docker build -q -t build-kata-deploy \
|
docker build -q -t build-kata-deploy \
|
||||||
--build-arg IMG_USER="${USER}" \
|
--build-arg IMG_USER="${USER}" \
|
||||||
--build-arg UID=${uid} \
|
--build-arg UID=${uid} \
|
||||||
@ -39,9 +45,14 @@ docker build -q -t build-kata-deploy \
|
|||||||
"${script_dir}/dockerbuild/"
|
"${script_dir}/dockerbuild/"
|
||||||
|
|
||||||
docker run \
|
docker run \
|
||||||
|
-v $HOME/.docker:/root/.docker \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
--env CI="${CI:-}" \
|
--env CI="${CI:-}" \
|
||||||
--env USER=${USER} -v "${kata_dir}:${kata_dir}" \
|
--env USER=${USER} -v "${kata_dir}:${kata_dir}" \
|
||||||
--rm \
|
--rm \
|
||||||
-w ${script_dir} \
|
-w ${script_dir} \
|
||||||
build-kata-deploy "${kata_deploy_create}" $@
|
build-kata-deploy "${kata_deploy_create}" $@
|
||||||
|
|
||||||
|
if [ $remove_dot_docker_dir == true ]; then
|
||||||
|
rm -rf "$HOME/.docker"
|
||||||
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user