mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-17 15:38:00 +00:00
packaging: Mount $HOME/.docker in the 1st layer container
In order to ensure that the proxy configuration is passed to the 2nd
layer container, let's ensure the $HOME/.docker/config.json file is
exposed inside the 1st layer container.
For some reason which I still don't fully understand exporting
https_proxy / http_proxy / no_proxy was not enough to get those
variables exported to the 2nd layer container.
In this commit we're creating a "$HOME/.docker" directory, and removing
it after the build, in case it doesn't exist yet. The reason we do this
is to avoid docker not running in case "$HOME/.docker" doesn't exist.
This was not tested with podman, but if there's an issue with podman,
the issue was already there beforehand and should be treated as a
different problem than the one addressed in this commit.
Fixes: #5077
Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
(cherry picked from commit 4da743f90b
)
This commit is contained in:
parent
8ad86e2ec9
commit
f476470c37
@ -31,6 +31,12 @@ if [ ${docker_gid} == ${gid} ]; then
|
||||
docker_gid=""
|
||||
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 \
|
||||
--build-arg IMG_USER="${USER}" \
|
||||
--build-arg UID=${uid} \
|
||||
@ -39,6 +45,7 @@ docker build -q -t build-kata-deploy \
|
||||
"${script_dir}/dockerbuild/"
|
||||
|
||||
docker run \
|
||||
-v $HOME/.docker:/root/.docker \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
--user ${uid}:${gid} \
|
||||
--env CI="${CI:-}" \
|
||||
@ -52,3 +59,7 @@ docker run \
|
||||
--rm \
|
||||
-w ${script_dir} \
|
||||
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