From 1619806de07a44b7ab995baa22682c00e60467d4 Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Sat, 21 Dec 2019 11:04:46 -0700 Subject: [PATCH] Replaced build script with Makefile --- .dockerignore | 2 +- Makefile | 8 ++++++ build.sh | 69 --------------------------------------------------- 3 files changed, 9 insertions(+), 70 deletions(-) create mode 100644 Makefile delete mode 100755 build.sh diff --git a/.dockerignore b/.dockerignore index 3cc9982..5cade2c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ .git -build.sh LICENSE +Makefile README.md diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..722ef74 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +IMAGE_NAME="phlak/mumble" +IMAGE_TAG="$$(grep 'ARG MUMBLE_VERSION' Dockerfile | awk -F = '{print $$2}')" + +build: + @docker build --force-rm --pull --tag $(IMAGE_NAME):$(IMAGE_TAG) . + +purge: + @docker image rm --force $(IMAGE_NAME):$(IMAGE_TAG) diff --git a/build.sh b/build.sh deleted file mode 100755 index c2cf853..0000000 --- a/build.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env bash -set -o errexit - -## PRE-RUN SETUP & CONFIGURATION -######################################## - -SCRIPT_DIR="$(dirname $(readlink -f ${0}))" - -IMAGE_NAME="phlak/mumble" -TAG="$(grep 'ARG MUMBLE_VERSION' Dockerfile | awk -F = '{print $2}')" - -## SCRIPT USAGE -######################################## - -function usageShort() { - echo "Usage: $(basename ${0}) [OPTIONS]" -} - -function usageLong() { - - usageShort - - cat <<-EOF - - OPTIONS: - - -h, --help Print this help dialogue - -p, --purge Purge the image after build - - EOF - -} - -## OPTION / PARAMATER PARSING -######################################## - -PARSED_OPTIONS=$(getopt -n "${0}" -o hp -l "help,purge" -- "$@") - -eval set -- "${PARSED_OPTIONS}" - -while true; do - case "${1}" in - -h|--help) usageLong; exit ;; - -p|--purge) PURGE=true; shift ;; - --) shift; break ;; - esac -done - -## SCRIPT FUNCTIONS -######################################## - -function buildImage() { - docker build --force-rm --pull --tag ${IMAGE_NAME}:${TAG} ${SCRIPT_DIR} -} - -function purgeImage() { - docker rmi --force ${IMAGE_NAME}:${TAG} - echo "Purged image: ${IMAGE_NAME}:${TAG}" -} - -function main() { - buildImage; [[ "${PURGE}" == true ]] && purgeImage - echo "Successfully built ${IMAGE_NAME}:${TAG}" -} - -# MAKE IT SO -######################################## - -main