From 3d83533d555a1ede04fed652f266b1cd6fc9c1a3 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Fri, 17 Jan 2020 22:38:58 -0500
Subject: [PATCH] fix artifact retrieval

---
 Dockerfile      | 9 ++++++---
 README.md       | 1 +
 readme-vars.yml | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b43a48e..ccf6c56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	git \
+	jq \
 	nano \
 	net-tools \
 	sudo && \
@@ -22,12 +23,14 @@ RUN \
 	CODE_RELEASE=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
  fi && \
+ CODE_URL=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/tags/${CODE_RELEASE}" \
+	| jq -r '.assets[] | select(.browser_download_url | contains("linux-x86_64")) | .browser_download_url') && \
  curl -o \
- /tmp/code.tar.gz -L \
-	"https://github.com/cdr/code-server/releases/download/${CODE_RELEASE}/code-server${CODE_RELEASE}-linux-x86_64.tar.gz" && \
+	/tmp/code.tar.gz -L \
+	"${CODE_URL}" && \
  tar xzf /tmp/code.tar.gz -C \
 	/usr/bin/ --strip-components=1 \
-  --wildcards code-server*/code-server && \
+	--wildcards code-server*/code-server && \
  echo "**** clean up ****" && \
  rm -rf \
 	/tmp/* \
diff --git a/README.md b/README.md
index b6737e3..801503d 100644
--- a/README.md
+++ b/README.md
@@ -229,6 +229,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **17.01.20:** - Fix artifact url retrieval from github.
 * **24.10.19:** - Upgrade to v2 builds.
 * **28.09.19:** - Update project logo.
 * **21.09.19:** - Add development builds/tag.
diff --git a/readme-vars.yml b/readme-vars.yml
index 51be44a..8189cb1 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -65,6 +65,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "17.01.20:", desc: "Fix artifact url retrieval from github." }
   - { date: "24.10.19:", desc: "Upgrade to v2 builds." }
   - { date: "28.09.19:", desc: "Update project logo." }
   - { date: "21.09.19:", desc: "Add development builds/tag." }