From ff6b3dbd4f6bf87c07c176a3f1c2238c71104c67 Mon Sep 17 00:00:00 2001
From: janpapenbrock <j.papenbrock@hochzehn.com>
Date: Sat, 6 May 2017 10:30:29 +0200
Subject: [PATCH] Refactor to make URLs easier to change and reduce repetition.

---
 Dockerfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 761f6b8bf..ecd4b02ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,12 +3,15 @@ FROM java:8
 MAINTAINER Timo Pagel <dependencycheckmaintainer@timo-pagel.de>
 
 ENV user=dependencycheck
+ENV version_url=https://jeremylong.github.io/DependencyCheck/current.txt
+ENV download_url=https://dl.bintray.com/jeremy-long/owasp
 
-RUN wget -O /tmp/current.txt http://jeremylong.github.io/DependencyCheck/current.txt && \
- current=$(cat /tmp/current.txt) && \
- wget https://dl.bintray.com/jeremy-long/owasp/dependency-check-$current-release.zip && \
- unzip dependency-check-$current-release.zip && \
- rm dependency-check-$current-release.zip && \
+RUN wget -O /tmp/current.txt ${version_url} && \
+ version=$(cat /tmp/current.txt) && \
+ file="dependency-check-${version}-release.zip" && \
+ wget "$download_url/$file" && \
+ unzip ${file} && \
+ rm ${file} && \
  mv dependency-check /usr/share/
 
 RUN useradd -ms /bin/bash ${user} && \