From 1b1d7f5ec020c8fe9a679954047d02e524d853e7 Mon Sep 17 00:00:00 2001
From: Mark Beamer Jr <markbeamerjr@gmail.com>
Date: Tue, 13 Aug 2019 23:03:37 -0400
Subject: [PATCH] Add build argument for docker build.sh file Update compose to
 use v0.38.6 of lbrynet

---
 e2e/docker-compose.yml         | 2 +-
 e2e/lbrynet/docker-compose.yml | 2 +-
 e2e/lbrynet/docker/Dockerfile  | 6 +++---
 e2e/lbrynet/docker/build.sh    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 217c5d9..73e67b0 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -47,7 +47,7 @@ services:
   ## Lbrynet ##
   #############
   lbrynet:
-    image: lbry/lbrynet:v0.38.5
+    image: lbry/lbrynet:v0.38.6
     restart: always
     ports:
       - "15100:5279"
diff --git a/e2e/lbrynet/docker-compose.yml b/e2e/lbrynet/docker-compose.yml
index d49c0f7..3b835a1 100644
--- a/e2e/lbrynet/docker-compose.yml
+++ b/e2e/lbrynet/docker-compose.yml
@@ -8,7 +8,7 @@ services:
   ## Lbrynet ##
   #############
   lbrynet:
-    image: lbry/lbrynet:v0.38.5
+    image: lbry/lbrynet:v0.38.6
     restart: "no"
     networks:
       lbry-network:
diff --git a/e2e/lbrynet/docker/Dockerfile b/e2e/lbrynet/docker/Dockerfile
index d7ae70a..258309f 100644
--- a/e2e/lbrynet/docker/Dockerfile
+++ b/e2e/lbrynet/docker/Dockerfile
@@ -1,10 +1,10 @@
 ## This base image is for running the latest lbrynet-daemon release.
-FROM ubuntu:16.04 as prep
+FROM ubuntu:18.04 as prep
 LABEL MAINTAINER="leopere [at] nixc [dot] us"
 RUN apt-get update && apt-get -y install unzip curl telnet wait-for-it
 
 ## Add lbrynet
-ARG VERSION="v0.38.5"
+ARG VERSION="v0.38.6"
 RUN URL=$(curl -s https://api.github.com/repos/lbryio/lbry-sdk/releases/$(if [ "${VERSION}" = 'latest' ]; then echo "latest"; else echo "tags/${VERSION}"; fi) | grep browser_download_url | grep lbrynet-linux.zip | cut -d'"' -f4) && echo $URL && curl -L -o /lbrynet.linux.zip $URL
 
 COPY start.sh /usr/bin/start
@@ -13,7 +13,7 @@ RUN unzip /lbrynet.linux.zip -d /lbrynet/ && \
     mv /lbrynet/lbrynet /usr/bin && \
     chmod a+x /usr/bin/checkmount /usr/bin/start /usr/bin/lbrynet
 
-FROM ubuntu:16.04 as app
+FROM ubuntu:18.04 as app
 COPY --from=prep /usr/bin/start /usr/bin/checkmount /usr/bin/lbrynet /usr/bin/
 RUN adduser lbrynet --gecos GECOS --shell /bin/bash --disabled-password --home /home/lbrynet
 ## Daemon port [Intended for internal use]
diff --git a/e2e/lbrynet/docker/build.sh b/e2e/lbrynet/docker/build.sh
index 8cb5ebf..00301d2 100755
--- a/e2e/lbrynet/docker/build.sh
+++ b/e2e/lbrynet/docker/build.sh
@@ -4,5 +4,5 @@ if [ $# -eq 0 ]
     echo "No docker tag argument supplied. Use './build.sh <tag>'"
     exit 1
 fi
-docker build --tag lbry/lbrynet:$1 .
+docker build --build-arg VERSION=$1 --tag lbry/lbrynet:$1 .
 docker push lbry/lbrynet:$1
\ No newline at end of file