diff --git a/docker-download.sh b/docker-download.sh index 2109916..9c48893 100755 --- a/docker-download.sh +++ b/docker-download.sh @@ -36,17 +36,14 @@ if [ -f sha256sums.sig ]; then fi fi -# download file via rsync -rsync -av "$FILE_HOST::downloads/$DOWNLOAD_PATH/$DOWNLOAD_FILE" . || exit 1 - -# contains the actually downloaded file so no further globbing is required -LOCAL_FILE="$(find . -name "$DOWNLOAD_FILE" -exec basename {} \;)" +FILE_NAME=$(grep "$DOWNLOAD_FILE" sha256sums | cut -d "*" -f 2) +wget "https://$FILE_HOST/$DOWNLOAD_PATH/$FILE_NAME" || exit 1 # shrink checksum file to single desired file and verify downloaded archive -grep "$LOCAL_FILE" sha256sums > sha256sums_min +grep "$FILE_NAME" sha256sums > sha256sums_min sha256sum -c sha256sums_min rm -f sha256sums{,_min,.sig,.asc} mkdir -p ./build -tar xf "$LOCAL_FILE" --strip=1 -C ./build -rm -rf "$LOCAL_FILE" +tar xf "$FILE_NAME" --strip=1 -C ./build +rm -rf "$FILE_NAME" diff --git a/docker-imagebuilder.sh b/docker-imagebuilder.sh index 92c39ab..a13f169 100755 --- a/docker-imagebuilder.sh +++ b/docker-imagebuilder.sh @@ -6,7 +6,7 @@ TARGET=$(echo "$CI_JOB_NAME" | cut -d _ -f 2-) export TARGET="${TARGET:-x86-64}" export VERSION="${VERSION:-snapshot}" export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-imagebuilder}" -export DOWNLOAD_FILE="openwrt-imagebuilder*x86_64.tar.xz" +export DOWNLOAD_FILE="openwrt-imagebuilder.*x86_64.tar.xz" if [ "$VERSION" = "snapshot" ]; then export BRANCH="master" diff --git a/docker-rootfs.sh b/docker-rootfs.sh index 21d4672..a676df8 100755 --- a/docker-rootfs.sh +++ b/docker-rootfs.sh @@ -6,7 +6,7 @@ TARGET=$(echo "$CI_JOB_NAME" | cut -d _ -f 2-) export TARGET="${TARGET:-x86-64}" export VERSION="${VERSION:-snapshot}" export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-rootfs}" -export DOWNLOAD_FILE="openwrt-*-rootfs.tar.gz" +export DOWNLOAD_FILE="openwrt-.*-rootfs.tar.gz" export DOCKERFILE="Dockerfile.rootfs" if [ "$VERSION" = "snapshot" ]; then diff --git a/docker-sdk.sh b/docker-sdk.sh index 653051e..bb812b6 100755 --- a/docker-sdk.sh +++ b/docker-sdk.sh @@ -10,7 +10,7 @@ export TARGET="${TARGET:-x86-64}" export ARCH="${ARCH:-x86_64}" export VERSION="${VERSION:-snapshot}" export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-sdk}" -export DOWNLOAD_FILE="openwrt-sdk-*.Linux-x86_64.tar.xz" +export DOWNLOAD_FILE="openwrt-sdk-.*.Linux-x86_64.tar.xz" if [ "$VERSION" = "snapshot" ]; then export BRANCH="master"