From a1a42cff022cdbb69ae38b7e4787c638f9edefff Mon Sep 17 00:00:00 2001
From: Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Date: Fri, 30 Dec 2016 12:20:53 -0700
Subject: [PATCH] Use ARG (instead of ENV) where appropriate

---
 Dockerfile | 4 ++--
 build.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 805440d..6217da5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.5
 MAINTAINER Chris Kankiewicz <Chris@ChrisKankiewicz.com>
 
 # Define Mumble version
-ENV MUMBLE_VERSION 1.2.18
+ARG MUMBLE_VERSION=1.2.18
 
 # Create Mumble directories
 RUN mkdir -pv /opt/mumble /etc/mumble
@@ -18,7 +18,7 @@ COPY files/supw /usr/local/bin/supw
 RUN chmod +x /usr/local/bin/supw
 
 # Set the bzip archive URL
-ENV BZIP_URL https://github.com/mumble-voip/mumble/releases/download/${MUMBLE_VERSION}/murmur-static_x86-${MUMBLE_VERSION}.tar.bz2
+ARG BZIP_URL=https://github.com/mumble-voip/mumble/releases/download/${MUMBLE_VERSION}/murmur-static_x86-${MUMBLE_VERSION}.tar.bz2
 
 # Install dependencies, fetch Mumble bzip archive and chown files
 RUN apk add --update ca-certificates bzip2 tar tzdata wget \
diff --git a/build.sh b/build.sh
index e546ccf..c2cf853 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ set -o errexit
 SCRIPT_DIR="$(dirname $(readlink -f ${0}))"
 
 IMAGE_NAME="phlak/mumble"
-TAG="$(grep 'ENV MUMBLE_VERSION' Dockerfile | awk '{print $3}')"
+TAG="$(grep 'ARG MUMBLE_VERSION' Dockerfile | awk -F = '{print $2}')"
 
 ## SCRIPT USAGE
 ########################################