From dcd9b65bbbfe88b06acff88d33a6c6b31e55cfb0 Mon Sep 17 00:00:00 2001
From: Armin Friedl <dev@friedl.net>
Date: Sun, 12 Jul 2020 11:46:47 +0200
Subject: [PATCH] Get correct versions for docker image

---
 .drone.yml           | 2 ++
 container/Dockerfile | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0139f73..e994973 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -50,6 +50,8 @@ steps:
     context: ./container
     repo: arminfriedl/fling
     tags: 0.1.0-snapshot
+    build_args:
+      - VERSION=0.1.0-snapshot
 
 - name: runservice
   image: arminfriedl/fling:0.1.0-snapshot
diff --git a/container/Dockerfile b/container/Dockerfile
index bdce3b3..08d47a2 100644
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -1,10 +1,12 @@
 FROM alpine:latest
 
+ARG VERSION
+
 RUN apk add --update --no-cache nginx openjdk11-jre && \
   mkdir -p /var/fling/files && \
   mkdir -p /tmp/fling && \
-  wget -O /tmp/fling/service.jar "https://nexus.friedl.net/service/rest/v1/search/assets/download?sort=version&maven.groupId=net.friedl&maven.artifactId=fling&maven.baseVersion=*SNAPSHOT&maven.extension=jar" && \
-  wget -O /tmp/fling/web.tar.gz "https://nexus.friedl.net/repository/build-artifacts/fling-web-latest.tar.gz" && \
+  wget -O /tmp/fling/service.jar "https://nexus.friedl.net/service/rest/v1/search/assets/download?sort=version&maven.groupId=net.friedl&maven.artifactId=fling&maven.baseVersion=$(echo -n $VERSION | tr [:lower:] [:upper:])&maven.extension=jar" && \
+  wget -O /tmp/fling/web.tar.gz "https://nexus.friedl.net/repository/build-artifacts/fling-web-$(echo -n $VERSION | tr [:upper:] [:lower:]).tar.gz" && \
   tar xzf /tmp/fling/web.tar.gz -C /tmp/fling && \
   ls -al /tmp/fling && \
   mkdir -p /var/www/fling && mv /tmp/fling/build/* /var/www/fling && \