Merge pull request #55 from funbox/develop

Version 0.22.0

.travis.yml

@@ -1,8 +1,11 @@
+dist: xenial
+
 language: go
 
 go:
   - 1.10.x
   - 1.11.x
+  - 1.12.x
   - tip
 
 os:

Makefile

@@ -1,12 +1,14 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 0.8.0 using next command:
+# This Makefile generated by GoMakeGen 1.1.2 using next command:
 # gomakegen .
+#
+# More info: https://kaos.sh/gomakegen
 
 ################################################################################
 
 .DEFAULT_GOAL := help
-.PHONY = fmt all clean deps deps-test test help
+.PHONY = fmt all clean git-config deps deps-test test gen-fuzz help
 
 ################################################################################
 
@@ -15,24 +17,29 @@ all: init-exporter ## Build all binaries
 init-exporter: ## Build init-exporter binary
 	go build init-exporter.go
 
-install: ## Install binaries
+install: ## Install all binaries
 	cp init-exporter /usr/bin/init-exporter
 
-uninstall: ## Uninstall binaries
+uninstall: ## Uninstall all binaries
 	rm -f /usr/bin/init-exporter
 
-deps: ## Download dependencies
+git-config: ## Configure git redirects for stable import path services
 	git config --global http.https://pkg.re.followRedirects true
+
+deps: git-config ## Download dependencies
 	go get -d -v pkg.re/essentialkaos/ek.v10
 	go get -d -v pkg.re/essentialkaos/go-simpleyaml.v1
 
-deps-test: ## Download dependencies for tests
-	git config --global http.https://pkg.re.followRedirects true
+deps-test: git-config ## Download dependencies for tests
 	go get -d -v pkg.re/check.v1
 	go get -d -v pkg.re/essentialkaos/ek.v10
 
 test: ## Run tests
-	go test -covermode=count ./...
+	go test -covermode=count ./export ./procfile
+
+gen-fuzz: ## Generate archives for fuzz testing
+	which go-fuzz-build &>/dev/null || go get -u -v github.com/dvyukov/go-fuzz/go-fuzz-build
+	go-fuzz-build -o procfile-fuzz.zip github.com/funbox/init-exporter/procfile
 
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
@@ -41,9 +48,10 @@ clean: ## Remove generated files
 	rm -f init-exporter
 
 help: ## Show this info
-	@echo -e '\nSupported targets:\n'
+	@echo -e '\n\033[1mSupported targets:\033[0m\n'
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
-		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-12s\033[0m %s\n", $$1, $$2}'
+		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-15s\033[0m %s\n", $$1, $$2}'
 	@echo -e ''
+	@echo -e '\033[90mGenerated by GoMakeGen 1.1.2\033[0m\n'
 
 ################################################################################

README.md

@@ -23,7 +23,7 @@ Before the initial install allows git to use redirects for [pkg.re](https://gith
 git config --global http.https://pkg.re.followRedirects true
 ```
 
-To build the init-exporter from scratch, make sure you have a working Go 1.8+ workspace ([instructions](https://golang.org/doc/install)), then:
+To build the init-exporter from scratch, make sure you have a working Go 1.10+ workspace ([instructions](https://golang.org/doc/install)), then:
 
 ```bash
 go get -d github.com/funbox/init-exporter
@@ -36,14 +36,14 @@ make all
 #### From ESSENTIAL KAOS Public repo for RHEL6/CentOS6
 
 ```
-[sudo] yum install -y https://yum.kaos.st/6/release/x86_64/kaos-repo-9.1-0.el6.noarch.rpm
+[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el6.noarch.rpm
 [sudo] yum install init-exporter
 ```
 
 #### From ESSENTIAL KAOS Public repo for RHEL7/CentOS7
 
 ```
-[sudo] yum install -y https://yum.kaos.st/7/release/x86_64/kaos-repo-9.1-0.el7.noarch.rpm
+[sudo] yum install -y https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm
 [sudo] yum install init-exporter
 ```
 

cli/cli.go

@@ -4,7 +4,7 @@ package cli
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 //                                                                                    //
-//                       Copyright (c) 2006-2018 FB GROUP LLC                         //
+//                       Copyright (c) 2006-2019 FB GROUP LLC                         //
 //                                                                                    //
 // ////////////////////////////////////////////////////////////////////////////////// //
 
@@ -32,7 +32,7 @@ import (
 // App props
 const (
 	APP  = "init-exporter"
-	VER  = "0.21.0"
+	VER  = "0.22.0"
 	DESC = "Utility for exporting services described by Procfile to init system"
 )
 

common/init-exporter.spec

@@ -42,7 +42,7 @@
 
 Summary:         Utility for exporting services described by Procfile to init system
 Name:            init-exporter
-Version:         0.21.0
+Version:         0.22.0
 Release:         0%{?dist}
 Group:           Development/Tools
 License:         MIT
@@ -52,7 +52,7 @@ Source0:         %{name}-%{version}.tar.gz
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:   golang >= 1.10
+BuildRequires:   golang >= 1.12
 
 Provides:        upstart-exporter = %{version}-%{release}
 Provides:        systemd-exporter = %{version}-%{release}
@@ -111,9 +111,15 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Fri Jul 12 2019 Anton Novojilov <[email protected]> - 0.22.0-0
+- Added 'start_on_device' option for v2 procfile format
+- Dropped 'reload_signal' support for Upstart ≤ 1.10.0
+- Fixed 'reload_signal' support for Systemd
+
 * Wed Jan 09 2019 Anton Novojilov <[email protected]> - 0.21.0-0
 - Migrated to ek.v10
 - Added support of memlock limit configuration
+- Fixed support of reload signal for Systemd
 
 * Mon Oct 29 2018 Anton Novojilov <[email protected]> - 0.20.3-0
 - Fixed bug with parsing v1 procfile (found by go-fuzz)

docker/Dockerfile.systemd

@@ -3,7 +3,7 @@ FROM centos:centos7
 ENV GOPATH /root
 ENV TARGET /root/src/github.com/funbox/init-exporter
 
-RUN yum install -y https://yum.kaos.io/7/release/x86_64/kaos-repo-8.0-0.el7.noarch.rpm
+RUN yum install -y https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm
 RUN yum clean all && yum -y update
 
 RUN yum -y install make golang

docker/Dockerfile.upstart

@@ -3,7 +3,7 @@ FROM centos:centos6
 ENV GOPATH /root
 ENV TARGET /root/src/github.com/funbox/init-exporter
 
-RUN yum install -y https://yum.kaos.io/6/release/x86_64/kaos-repo-8.0-0.el6.noarch.rpm
+RUN yum install -y https://yum.kaos.st/kaos-repo-latest.el6.noarch.rpm
 RUN yum clean all && yum -y update
 
 RUN yum -y install make golang