From f7ae400eb3f9a193ad0bd8ae18911e5f1f9fffd5 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 15 Mar 2021 16:54:33 +0100 Subject: [PATCH] Use makefile for releasing installer --- Makefile | 7 ++++++- README.md | 5 ++--- installer/compose.yml | 2 -- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 607361e..b6338e1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: test shellcheck docopt kcov codecov +.PHONY: test shellcheck docopt kcov codecov release-installer test: @sudo DOCKER_CONTEXT=default docker run \ @@ -43,3 +43,8 @@ codecov: SHELL:=/bin/bash codecov: @bash <(curl -s https://codecov.io/bash) \ -s coverage -t $$(pass show hosts/swarm.autonomic.zone/drone/codecov/token) + +release-installer: + @docker stack rm abra-installer-script && \ + cd installer && \ + docker stack deploy -c compose.yml abra-installer-script diff --git a/README.md b/README.md index 3321dc9..8b57b66 100644 --- a/README.md +++ b/README.md @@ -47,13 +47,12 @@ git pull ## Hack -It's written in Bash! Just open up the `abra` file and start hacking. Then you can run it in place with `./abra`. The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser. +It's written in Bash version 4 or greater! Just open up the `abra` file and start hacking. Then you can run it in place with `./abra`. The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser. Please remember to update the [CHANGELOG](./CHANGELOG.md) when you make a change. To deploy a new version of the installer scripts: ```sh -cd installer -DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script +make release-installer ``` diff --git a/installer/compose.yml b/installer/compose.yml index 6944f1f..67477ef 100644 --- a/installer/compose.yml +++ b/installer/compose.yml @@ -26,10 +26,8 @@ services: configs: abra_installer: - name: abra_installer_v2 file: installer abra_conf: - name: abra_conf_v1 file: nginx.conf networks: