Fix aria2c path

This commit is contained in:
jalr 2018-04-02 04:26:52 +02:00
parent 85b9a78c57
commit f15b7d89c7
3 changed files with 3 additions and 4 deletions

View file

@ -52,6 +52,7 @@ images/debian-stretch.squashfs: images
--rm \
-v /var/run/docker.sock:/var/run/docker.sock \
-v "${PWD}/packer:/workdir" \
-v "${PWD}/aria2c:/workdir/aria2c" \
-v "${PWD}/images:/images" \
-e "user=`id -u`" \
-e "group=`id -g`" \

View file

@ -37,8 +37,6 @@ make_torrent() {
}
run_packer() {
touch /aria2c
packer build "$NAME.json"
if [ "$user" != "" ] && [ "$group" != "" ]; then

View file

@ -36,7 +36,7 @@
"provisioners": [
{
"type": "file",
"source": "/aria2c",
"source": "aria2c",
"destination": "/usr/local/bin/aria2c"
},
{
@ -64,7 +64,7 @@
"echo \"LABSYNC_PROJECT_URL='{{user `ci_project_url`}}'\" >> /etc/environment",
"set -x",
"sed -i 's#@@PROJECT_URL@@#{{user `ci_project_url`}}#' /etc/initramfs-tools/scripts/labsync",
"if [ -s /usr/local/bin/aria2c ]; then aria2c=/usr/local/bin/aria2c; else aria2c=/usr/bin/aria2c; fi",
"if ! [ -d /usr/local/bin/aria2c ]; then aria2c=/usr/local/bin/aria2c; else aria2c=/usr/bin/aria2c; fi",
"sed -i \"s#@@ARIA2C@@#$aria2c#\" /etc/initramfs-tools/scripts/local-premount/labsync-prereqs",
"apt-get update",
"apt-get -y dist-upgrade",