From d79166e2ce0f497dca29551ca3b5da03477bd0af Mon Sep 17 00:00:00 2001 From: JediNite Date: Fri, 11 Oct 2019 18:32:10 +1000 Subject: [PATCH 1/3] Update docker version to 19.03.3 --- wdpk/docker/apkg.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wdpk/docker/apkg.rc b/wdpk/docker/apkg.rc index 0970af2..d6b405d 100644 --- a/wdpk/docker/apkg.rc +++ b/wdpk/docker/apkg.rc @@ -1,5 +1,5 @@ Package: docker -Version: 19.03.2 +Version: 19.03.3 Packager: TFL Email: Homepage: https://docker.com From e5fdb3199643834f30d3953948a3ec57839173ed Mon Sep 17 00:00:00 2001 From: JediNite Date: Fri, 11 Oct 2019 18:36:43 +1000 Subject: [PATCH 2/3] Updated docker version to 19.03.3 and REL_TAG variable --- wdpk/docker/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wdpk/docker/install.sh b/wdpk/docker/install.sh index f6c8f74..711a814 100755 --- a/wdpk/docker/install.sh +++ b/wdpk/docker/install.sh @@ -21,13 +21,14 @@ ARCH="$(uname -m)" # download docker binaries cd "${APKG_PATH}" -TARBALL="docker-19.03.2.tgz" +TARBALL="docker-19.03.3.tgz" if [ ${ARCH} != "x86_64" ]; then ARCH="armel" + REL_TAG="v19.03.3" # JediNite provides custom docker packages for ARM # They are based on docker-runc without seccomp, as the kernel doesn't support it - URL="https://github.com/JediNite/docker-ce-WDEX4100-binaries/raw/master/armv7l-WDEX4100/${TARBALL}" + URL="https://github.com/JediNite/docker-ce-WDEX4100-binaries/releases/download/${REL_TAG}/${TARBALL}" else URL="https://download.docker.com/linux/static/stable/${ARCH}/${TARBALL}" fi From 0a2508f6dc87831f788553a9ec0849beef8371b4 Mon Sep 17 00:00:00 2001 From: JediNite Date: Sat, 12 Oct 2019 07:36:39 +1000 Subject: [PATCH 3/3] Updated to use $VERSION variable --- wdpk/docker/install.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wdpk/docker/install.sh b/wdpk/docker/install.sh index 711a814..c515d10 100755 --- a/wdpk/docker/install.sh +++ b/wdpk/docker/install.sh @@ -5,6 +5,9 @@ path_src=$1 NAS_PROG=$2 +# define docker version +VERSION="19.03.3" + log=/tmp/debug_apkg APKG_MODULE="docker" @@ -21,14 +24,13 @@ ARCH="$(uname -m)" # download docker binaries cd "${APKG_PATH}" -TARBALL="docker-19.03.3.tgz" +TARBALL="docker-${VERSION}.tgz" if [ ${ARCH} != "x86_64" ]; then ARCH="armel" - REL_TAG="v19.03.3" # JediNite provides custom docker packages for ARM # They are based on docker-runc without seccomp, as the kernel doesn't support it - URL="https://github.com/JediNite/docker-ce-WDEX4100-binaries/releases/download/${REL_TAG}/${TARBALL}" + URL="https://github.com/JediNite/docker-ce-WDEX4100-binaries/releases/download/${VERSION}/${TARBALL}" else URL="https://download.docker.com/linux/static/stable/${ARCH}/${TARBALL}" fi