Commit 21d693f6 by zCaesar

test

parent ccba6d9b
...@@ -117,13 +117,13 @@ build: init pre-build docker-build post-build ...@@ -117,13 +117,13 @@ build: init pre-build docker-build post-build
pre-build: pre-build:
post-build: post-build:
@rm .make-function # @rm .make-function
post-push: post-push:
@rm .make-function # @rm .make-function
post-init: post-init:
@rm .make-function # @rm .make-function
docker-build: docker-build:
docker build -t $(IMAGE):$(VERSION) . docker build -t $(IMAGE):$(VERSION) .
...@@ -149,11 +149,11 @@ snapshot: build push ...@@ -149,11 +149,11 @@ snapshot: build push
show-tag: init release.conf show-tag: init release.conf
@. $(RELEASE_SUPPORT); getVersion @. $(RELEASE_SUPPORT); getVersion
@rm .make-function # @rm .make-function
showtag: init release.conf showtag: init release.conf
@. $(RELEASE_SUPPORT); getVersion @. $(RELEASE_SUPPORT); getVersion
@rm .make-function # @rm .make-function
tag-patch-release: init tag-patch-release: init
VERSION := $(shell . $(RELEASE_SUPPORT); nextPatchLevel) VERSION := $(shell . $(RELEASE_SUPPORT); nextPatchLevel)
...@@ -187,7 +187,7 @@ tag: check-status ...@@ -187,7 +187,7 @@ tag: check-status
check-status: init check-status: init
@. $(RELEASE_SUPPORT) ; ! hasChanges || (echo "ERROR: there are still outstanding changes" >&2) ; @. $(RELEASE_SUPPORT) ; ! hasChanges || (echo "ERROR: there are still outstanding changes" >&2) ;
@rm .make-function # @rm .make-function
check-release: init release.conf post-init check-release: init release.conf post-init
@. $(RELEASE_SUPPORT) ; tagExists $(TAG) || (echo "ERROR: version not yet tagged in git. make [minor,major,patch]-release." >&2 && exit 1) ; @. $(RELEASE_SUPPORT) ; tagExists $(TAG) || (echo "ERROR: version not yet tagged in git. make [minor,major,patch]-release." >&2 && exit 1) ;
...@@ -196,7 +196,7 @@ check-release: init release.conf post-init ...@@ -196,7 +196,7 @@ check-release: init release.conf post-init
update-make: init update-make: init
@rm Makefile @rm Makefile
wget https://dev.nexpie.com/sample/docker-makefile-sample/raw/master/Makefile wget https://dev.nexpie.com/sample/docker-makefile-sample/raw/master/Makefile
@rm .make-function # @rm .make-function
make-version: make-version:
@echo $(MAKE_VERSION) @echo $(MAKE_VERSION)
...@@ -109,7 +109,7 @@ module.exports = function (options = {}) { ...@@ -109,7 +109,7 @@ module.exports = function (options = {}) {
console.log('redis:status: ' + status) console.log('redis:status: ' + status)
res.send({ res.send({
"result": status ? "ok" : "no" "result": status ? "ok" : "no"
}); });
}) })
// const util = require('util') // const util = require('util')
// console.log(util.inspect(status, false, null, true)) // console.log(util.inspect(status, false, null, true))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment