From d153528f5da64570cdc0c8f362b0893b92ca74d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Hern=C3=A1ndez?= Date: Fri, 29 May 2020 11:52:32 -0500 Subject: [PATCH] Makefile refactor * Added SHELL to run everything in bash * Added feature to change Dockerfile for test builds * Added test target --- docker/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index f36b413..ddd9aea 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,6 +1,8 @@ +SHELL = /bin/bash NAME = captcha-bot BOT_LANG ?= EN SUPPORTED_LANGUAGES = EN FR DE ID IT ES CA GL EU RU PT_BR ZH_CN +DOCKERFILE = Dockerfile # Check if Bot token has been provided ifndef BOT_TOKEN @@ -22,10 +24,14 @@ ifneq ($(strip $(VALID_LANG)), true) $(error Invalid default language provided) endif +.PHONY: build force test + build: - docker build -t "${NAME_LOW}" --build-arg BOT_TOKEN="${BOT_TOKEN}" --build-arg BOT_LANG="${BOT_LANG_UPP}" . + docker build -f "${DOCKERFILE}" -t "${NAME_LOW}" --build-arg BOT_TOKEN="${BOT_TOKEN}" --build-arg BOT_LANG="${BOT_LANG_UPP}" . force: - docker build -t "${NAME_LOW}" --no-cache --build-arg BOT_TOKEN="${BOT_TOKEN}" --build-arg BOT_LANG="${BOT_LANG_UPP}" . + docker build -f "${DOCKERFILE}" -t "${NAME_LOW}" --no-cache --build-arg BOT_TOKEN="${BOT_TOKEN}" --build-arg BOT_LANG="${BOT_LANG_UPP}" . -.PHONY: build force +test: + $(MAKE) -e BOT_TOKEN=XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + docker run -it $(NAME_LOW):latest