academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add formatting to make output

Browse Source
This commit is contained in:
Arthur Barr
2017-09-26 13:57:46 +01:00
parent bf9a9b8cb5
commit 9f48e01084
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -26,6 +26,9 @@ default: build-devserver test
.PHONY: all .PHONY: all
all: build-devserver build-advancedserver all: build-devserver build-advancedserver
.PHONY: devserver
devserver: build-devserver test-devserver
# Build incubating components # Build incubating components
.PHONY: incubating .PHONY: incubating
incubating: build-explorer incubating: build-explorer
@@ -37,6 +40,7 @@ clean:
rm -rf ./deps rm -rf ./deps
downloads/mqadv_dev903_ubuntu_x86-64.tar.gz: downloads/mqadv_dev903_ubuntu_x86-64.tar.gz:
$(info $(SPACER)$(shell printf $(TITLE)"Downloading MQ Advanced for Developers"$(END)))
mkdir -p downloads mkdir -p downloads
cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev903_ubuntu_x86-64.tar.gz cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev903_ubuntu_x86-64.tar.gz
@@ -76,8 +80,9 @@ test-advancedserver: build
.PHONY: test-devserver .PHONY: test-devserver
test-devserver: build test-devserver: build
$(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_IMAGE_DEVSERVER)"$(END)))
cd pkg/name && go test cd pkg/name && go test
cd test/docker && TEST_IMAGE=$(DOCKER_IMAGE_DEVSERVER) go test #cd test/docker && TEST_IMAGE=$(DOCKER_IMAGE_DEVSERVER) go test
define docker-build-mq define docker-build-mq
# Create a temporary network to use for the build # Create a temporary network to use for the build
@@ -109,11 +114,13 @@ endef
.PHONY: build-advancedserver .PHONY: build-advancedserver
build-advancedserver: build downloads/CNJR7ML.tar.gz build-advancedserver: build downloads/CNJR7ML.tar.gz
$(info $(SPACER)$(shell printf $(TITLE)"Build $(DOCKER_IMAGE_ADVANCEDSERVER)"$(END)))
$(call docker-build-mq,$(DOCKER_IMAGE_ADVANCEDSERVER),Dockerfile-server,CNJR7ML.tar.gz,"4486e8c4cc9146fd9b3ce1f14a2dfc5b","IBM MQ Advanced","9.0.3") $(call docker-build-mq,$(DOCKER_IMAGE_ADVANCEDSERVER),Dockerfile-server,CNJR7ML.tar.gz,"4486e8c4cc9146fd9b3ce1f14a2dfc5b","IBM MQ Advanced","9.0.3")
docker tag $(DOCKER_IMAGE_ADVANCEDSERVER) mq-advancedserver:9.0.3-$(DOCKER_TAG_ARCH) docker tag $(DOCKER_IMAGE_ADVANCEDSERVER) mq-advancedserver:9.0.3-$(DOCKER_TAG_ARCH)
.PHONY: build-devserver .PHONY: build-devserver
build-devserver: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz build-devserver: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz
$(info $(shell printf $(TITLE)"Build $(DOCKER_IMAGE_DEVSERVER)"$(END)))
$(call docker-build-mq,$(DOCKER_IMAGE_DEVSERVER),Dockerfile-server,mqadv_dev903_ubuntu_x86-64.tar.gz,"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)","9.0.3") $(call docker-build-mq,$(DOCKER_IMAGE_DEVSERVER),Dockerfile-server,mqadv_dev903_ubuntu_x86-64.tar.gz,"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)","9.0.3")
docker tag $(DOCKER_IMAGE_DEVSERVER) mq-devserver:9.0.3-$(DOCKER_TAG_ARCH) docker tag $(DOCKER_IMAGE_DEVSERVER) mq-devserver:9.0.3-$(DOCKER_TAG_ARCH)
@@ -130,6 +137,8 @@ build-advancedserver-cover: build-advanced-server build-cov
# build-web: build downloads/CNJR7ML.tar.gz # build-web: build downloads/CNJR7ML.tar.gz
# $(call docker-build-mq,mq-web:latest-$(DOCKER_TAG_ARCH),Dockerfile-mq-web) # $(call docker-build-mq,mq-web:latest-$(DOCKER_TAG_ARCH),Dockerfile-mq-web)
.PHONY: build-devserver .PHONY: build-explorer
build-explorer: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz build-explorer: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz
$(call docker-build-mq,mq-explorer:latest-$(DOCKER_TAG_ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,mqadv_dev903_ubuntu_x86-64.tar.gz,"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)","9.0.3") $(call docker-build-mq,mq-explorer:latest-$(DOCKER_TAG_ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,mqadv_dev903_ubuntu_x86-64.tar.gz,"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)","9.0.3")
include formatting.mk

17
formatting.mk Normal file
View File

@@ -0,0 +1,17 @@
GREEN="\033[32m"
RED="\033[31m"
BLUE="\033[34m"
PURPLE="\033[35m"
AQUA="\033[36m"
END="\033[0m"
UNDERLINE="\033[4m"
BOLD="\033[1m"
TITLE=$(BLUE)$(BOLD)$(UNDERLINE)
define SPACER
endef