Merge pull request #545 from chavafg/topic/sudo-docker

static-builds: run docker commands using sudo
This commit is contained in:
Julio Montes 2019-05-28 09:54:08 -05:00 committed by GitHub
commit 3b9a48a702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions

View File

@ -13,6 +13,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${script_dir}/../../scripts/lib.sh" source "${script_dir}/../../scripts/lib.sh"
config_dir="${script_dir}/../../scripts/" config_dir="${script_dir}/../../scripts/"
nemu_tar="kata-nemu-static.tar.gz"
nemu_repo="${nemu_repo:-}" nemu_repo="${nemu_repo:-}"
nemu_version="${nemu_version:-}" nemu_version="${nemu_version:-}"
@ -48,7 +49,7 @@ http_proxy="${http_proxy:-}"
https_proxy="${https_proxy:-}" https_proxy="${https_proxy:-}"
prefix="${prefix:-"/opt/kata"}" prefix="${prefix:-"/opt/kata"}"
docker build \ sudo docker build \
--build-arg http_proxy="${http_proxy}" \ --build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \ --build-arg https_proxy="${https_proxy}" \
--build-arg NEMU_REPO="${nemu_repo}" \ --build-arg NEMU_REPO="${nemu_repo}" \
@ -61,7 +62,9 @@ docker build \
-f "${script_dir}/Dockerfile" \ -f "${script_dir}/Dockerfile" \
-t nemu-static -t nemu-static
docker run \ sudo docker run \
-i \ -i \
-v "${PWD}":/share nemu-static \ -v "${PWD}":/share nemu-static \
mv /tmp/nemu-static/kata-nemu-static.tar.gz /share/ mv "/tmp/nemu-static/${nemu_tar}" /share/
sudo chown ${USER}:${USER} "${PWD}/${nemu_tar}"

View File

@ -13,6 +13,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${script_dir}/../../scripts/lib.sh" source "${script_dir}/../../scripts/lib.sh"
config_dir="${script_dir}/../../scripts/" config_dir="${script_dir}/../../scripts/"
qemu_tar="kata-qemu-static.tar.gz"
qemu_repo="${qemu_repo:-}" qemu_repo="${qemu_repo:-}"
qemu_version="${qemu_version:-}" qemu_version="${qemu_version:-}"
@ -33,7 +34,7 @@ info "Build ${qemu_repo} version: ${qemu_version}"
http_proxy="${http_proxy:-}" http_proxy="${http_proxy:-}"
https_proxy="${https_proxy:-}" https_proxy="${https_proxy:-}"
docker build \ sudo docker build \
--build-arg http_proxy="${http_proxy}" \ --build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \ --build-arg https_proxy="${https_proxy}" \
--build-arg QEMU_REPO="${qemu_repo}" \ --build-arg QEMU_REPO="${qemu_repo}" \
@ -42,7 +43,9 @@ docker build \
-f "${script_dir}/Dockerfile" \ -f "${script_dir}/Dockerfile" \
-t qemu-static -t qemu-static
docker run \ sudo docker run \
-i \ -i \
-v "${PWD}":/share qemu-static \ -v "${PWD}":/share qemu-static \
mv /tmp/qemu-static/kata-qemu-static.tar.gz /share/ mv "/tmp/qemu-static/${qemu_tar}" /share/
sudo chown ${USER}:${USER} "${PWD}/${qemu_tar}"