Merge branch 'master' of github.com:krom/docker-compose-makefile

Author: krom

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.2 (2008-06-08)
+* Added showing release notes while upgrading
+* Changed create Makefile from Makefile.sample.mk instead of HEADER.mk
+
 ## 1.0.1 (2018-06-06)
 * Added Makefile.sample.mk
 * Added CHANGELOG.md

README.md

@@ -1,6 +1,4 @@
-Docker compose makefile
-=======================
-
+# Docker compose makefile
 [![Build Status](https://travis-ci.org/krom/docker-compose-makefile.svg?branch=master)](https://travis-ci.org/krom/docker-compose-makefile)
 [![Release](https://img.shields.io/github/release/krom/docker-compose-makefile.svg)](https://github.com/krom/docker-compose-makefile/releases/latest)
 [![Commits since last release](https://img.shields.io/github/commits-since/krom/docker-compose-makefile/latest.svg)](https://github.com/krom/docker-compose-makefile/commits/master)
@@ -12,16 +10,20 @@ Docker compose makefile
 
 Template and lib for docker-compose
 
-INSTALLATION
-------------
-Execute
+## INSTALLATION
+### INSTALLATION
+To install mk-lib run command
 ```bash
 curl -sL https://git.io/vh4Gn | sh
 ```
 
-USAGE
------
+### UPGRADE
+To upgrade existing mk-lib run command
+```bash
+make mk-upgrade
+```
 
+## USAGE
 ![Screen](https://raw.githubusercontent.com/krom/docker-compose-makefile/master/docs/screencast.gif)
 
 **Common (see [samples](https://github.com/krom/docker-compose-makefile/tree/master/samples))**
@@ -36,14 +38,13 @@ USAGE
 - **make mk-upgrade** - check for updates of mk-lib
 - **make mk-version** - show current version of mk-lib
 
-SAMPLES
--------
+## SAMPLES
 
-Basic command (you can copy and paste it into your Makefile)
+Basic commands (you can copy and paste it into your Makefile)
 
 ```makefile
 up: ## Start all or c=<name> containers in foreground
-	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) up -d $(c)
+	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) up $(c)
 
 start: ## Start all or c=<name> containers in background
 	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) up -d $(c)
@@ -63,32 +64,23 @@ clean: ## Clean all data
 ```
 You may see samples [here](https://github.com/krom/docker-compose-makefile/tree/master/samples)
 
-CUSTOMIZATION
--------------
+## CUSTOMIZATION
 You can create _.make.env_ file in directory with Makefile or **current** directory
 
 Available variables
 
 * DOCKER_COMPOSE = {docker-compose executable command}
 * DOCKER_COMPOSE_FILE = {custom docker-compose.yml file}
 
-TO-DO
------
-
+## TO-DO
 - check dependencies
 - update readme
 
-CHANGELOG
----------
-
-See [CHANGELOG](CHANGELOG.md))
-
-LICENSE
--------
+## CHANGELOG
+See [CHANGELOG](CHANGELOG.md)
 
+## LICENSE
 MIT (see [LICENSE](LICENSE))
 
-AUTHOR
-------
-
-[Roman Kudlay](http://roman.kudlay.pro) ([roman@kudlay.pro](maailto:roman@kudlay.pro))
+## AUTHOR
+[Roman Kudlay](http://roman.kudlay.pro) ([roman@kudlay.pro](mailto:roman@kudlay.pro))

samples/Makefile

@@ -3,26 +3,26 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 include $(ROOT_DIR)/.makefile-lib/common.mk
 # END OF REQUIRED SECTION
 
-.PHONY: help dependencies
+.PHONY: help dependencies up start stop restart status ps clean
 
 dependencies: check-dependencies ## Check dependencies
 
 up: ## Start all or c=<name> containers in foreground
-	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) up -d $(c)
+	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) up $(c)
 
 start: ## Start all or c=<name> containers in background
 	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) up -d $(c)
 
 stop: ## Stop all or c=<name> containers
 	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) stop $(c)
 
-status: ## Show status of containers
-	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) ps
-
 restart: ## Restart all or c=<name> containers
 	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) stop $(c)
 	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) up $(c) -d
 
+status: ## Show status of containers
+	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) ps
+
 ps: status ## Alias of status
 
 clean: ## Clean all data

scripts/install.sh

@@ -31,6 +31,6 @@ if [ -f Makefile ]; then
     echo "-------------------------------------------------------------------------------
 "
 else
-    cp .mk-lib/HEADER.mk Makefile
+    cp .mk-lib/Makefile.sample.mk Makefile
     echo "Created new Makefile. Feel free to add new commands"
 fi;

src/self-upgrade.sh

@@ -1,15 +1,28 @@
 #!/usr/bin/env sh
+# Get some property from release
+# Usage:
+#   get_latest_release user/repo tag_name
 get_latest_release() {
   curl --silent "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api
-    grep '"tag_name":' |                                            # Get tag line
+    grep "\"$2\":" |                                                # Get tag line
     sed -E 's/.*"([^"]+)".*/\1/'                                    # Pluck JSON value
 }
-v=$(get_latest_release $MK_REPO)
 
-if [ $v = $MK_VERSION ]; then
+# Getting last version
+NEW_VER=$(get_latest_release $MK_REPO tag_name)
+
+if [ $NEW_VER = $MK_VERSION ]; then
     echo 'Up to date';
 else
-    echo "A new version is available";
-    echo "Upgrading from $MK_VERSION to $v";
-    curl -sL https://raw.githubusercontent.com/$MK_REPO/master/scripts/upgrade.sh | ( echo "MK_REPO=$MK_REPO; MK_VERSION=$v; "; cat -   ) | sh
+    echo "A new version is available"
+    body=$(get_latest_release $MK_REPO body)
+    echo "Upgrading from $MK_VERSION to $NEW_VER
+
+     Release notes
+************************
+$body
+************************
+";
+    # Downloading and executing upgrade script
+    curl -sL https://raw.githubusercontent.com/$MK_REPO/master/scripts/upgrade.sh | ( echo "MK_REPO=$MK_REPO; MK_VERSION=$NEW_VER; "; cat -   ) | sh
 fi;