aboutsummaryrefslogtreecommitdiff
path: root/deployment
diff options
context:
space:
mode:
authorThomas Büttner <thomas@vergesslicher.tech>2019-02-24 11:17:39 +0100
committerThomas Büttner <thomas@vergesslicher.tech>2019-02-24 11:17:39 +0100
commit38ec68c488c0c8e88989dc7c3fdc0824cfe71343 (patch)
treeffe0eed0f51de936e8ceee4f32514f421bafa252 /deployment
parentda61998ad611bf25d5644223a82eed1cf2e3d835 (diff)
use common.build.sh for docker image builds
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
Diffstat (limited to 'deployment')
-rwxr-xr-xdeployment/common.build.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/deployment/common.build.sh b/deployment/common.build.sh
index 5bffa1a73..d028e3a66 100755
--- a/deployment/common.build.sh
+++ b/deployment/common.build.sh
@@ -15,7 +15,6 @@ DEFAULT_CONFIG="Release"
DEFAULT_OUTPUT_DIR="dist/jellyfin-git"
DEFAULT_PKG_DIR="pkg-dist"
DEFAULT_DOCKERFILE="Dockerfile"
-DEFAULT_IMAGE_TAG="jellyfin:"`git rev-parse --abbrev-ref HEAD`
DEFAULT_ARCHIVE_CMD="tar -xvzf"
# Parse the version from the AssemblyVersion
@@ -53,7 +52,7 @@ build_jellyfin_docker()
(
BUILD_CONTEXT=${1-$DEFAULT_BUILD_CONTEXT}
DOCKERFILE=${2-$DEFAULT_DOCKERFILE}
- IMAGE_TAG=${3-$DEFAULT_IMAGE_TAG}
+ IMAGE_TAG=${3-"jellyfin:$(git rev-parse --abbrev-ref HEAD)"}
echo -e "${CYAN}Building jellyfin docker image in '${BUILD_CONTEXT}' with Dockerfile '${DOCKERFILE}' and tag '${IMAGE_TAG}'.${NC}"
docker build -t ${IMAGE_TAG} -f ${DOCKERFILE} ${BUILD_CONTEXT}