OpenWRT
/
docker
mirror of https://github.com/openwrt/docker.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'wget' into 'master' 

Use wget for file downloads

See merge request openwrt/docker!38
pull/77/head
Paul Spooren 2021-02-13 00:34:06 +00:00
parent 713696a6a7 62692615da
commit 594cbb3c26
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker-download.sh
View File

@ -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"

2
docker-imagebuilder.sh
View File

@ -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"

2
docker-rootfs.sh
View File

@ -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

2
docker-sdk.sh
View File

@ -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"