Merge pull request #68 from gliderlabs/master

Release 0.8.0

CHANGELOG.md

@@ -1,17 +1,32 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v0.8.0](https://github.com/gliderlabs/registrator/compare/v0.7.1...v0.8.0) - 2022-01-31
+
+### Added
+
+- #66: @josegonzalez Add support for arm64
+
+### Fixed
+
+- #67: @josegonzalez Add missing jq dependency to build environment
+
+### Changed
+
+- #62: @dependabot chore(deps): bump golang from 1.17.2-buster to 1.17.3-buster
+- #65: @dependabot chore(deps): bump golang from 1.17.3-buster to 1.17.6-buster
+
 ## [v0.7.1](https://github.com/gliderlabs/registrator/compare/v0.7.0...v0.7.1) - 2020-10-28
 
 ### Fixed
 
-- #60 @josegonzalez Ensure binary name in package is sigil
+- #60: @josegonzalez Ensure binary name in package is sigil
 
 ## [v0.7.0](https://github.com/gliderlabs/registrator/compare/v0.6.0...v0.7.0) - 2020-10-28
 
 ### Fixed
 
-- #56 @0xflotus Fix typo in readme
+- #56: @0xflotus Fix typo in readme
 
 ### Added
 

Dockerfile.build

@@ -1,7 +1,7 @@
-FROM golang:1.17.2-buster
+FROM golang:1.17.6-buster
 
 RUN apt-get update \
-    && apt install apt-transport-https build-essential curl gnupg2 lintian rpm rsync rubygems-integration ruby-dev ruby -qy \
+    && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \
     && git clone https://github.com/bats-core/bats-core.git /tmp/bats-core \
     && cd /tmp/bats-core \
     && ./install.sh /usr/local \

Makefile

@@ -5,7 +5,7 @@ MAINTAINER_NAME = Jose Diaz-Gonzalez
 REPOSITORY = sigil
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-BASE_VERSION ?= 0.7.1
+BASE_VERSION ?= 0.8.0
 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY)
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
 BINARY_NAME = sigil
@@ -48,8 +48,10 @@ targets = $(addsuffix -in-docker, $(LIST))
 build: prebuild
 	@$(MAKE) build/darwin/$(NAME)
 	@$(MAKE) build/linux/$(NAME)-amd64
+	@$(MAKE) build/linux/$(NAME)-arm64
 	@$(MAKE) build/linux/$(NAME)-armhf
 	@$(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb
+	@$(MAKE) build/deb/$(NAME)_$(VERSION)_arm64.deb
 	@$(MAKE) build/deb/$(NAME)_$(VERSION)_armhf.deb
 	@$(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
 
@@ -79,6 +81,11 @@ build/linux/$(NAME)-amd64:
 										-ldflags "-s -w -X main.Version=$(VERSION)" \
 										-o build/linux/$(NAME)-amd64 cmd/sigil.go
 
+build/linux/$(NAME)-arm64:
+	mkdir -p build/linux
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \
+										-ldflags "-s -w -X main.Version=$(VERSION)" \
+										-o build/linux/$(NAME)-arm64 cmd/sigil.go
 build/linux/$(NAME)-armhf:
 	mkdir -p build/linux
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=5 go build -a -asmflags=-trimpath=/src -gcflags=-trimpath=/src \
@@ -105,6 +112,26 @@ build/deb/$(NAME)_$(VERSION)_amd64.deb: build/linux/$(NAME)-amd64
 		build/linux/$(NAME)-amd64=/usr/bin/$(BINARY_NAME) \
 		LICENSE=/usr/share/doc/$(NAME)/copyright
 
+build/deb/$(NAME)_$(VERSION)_arm64.deb: build/linux/$(NAME)-arm64
+	export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \
+		&& mkdir -p build/deb \
+		&& fpm \
+		--architecture arm64 \
+		--category utils \
+		--description "$$PACKAGE_DESCRIPTION" \
+		--input-type dir \
+		--license 'MIT License' \
+		--maintainer "$(MAINTAINER_NAME) <$(EMAIL)>" \
+		--name $(NAME) \
+		--output-type deb \
+		--package build/deb/$(NAME)_$(VERSION)_arm64.deb \
+		--url "https://github.com/$(MAINTAINER)/$(REPOSITORY)" \
+		--vendor "" \
+		--version $(VERSION) \
+		--verbose \
+		build/linux/$(NAME)-arm64=/usr/bin/$(BINARY_NAME) \
+		LICENSE=/usr/share/doc/$(NAME)/copyright
+
 build/deb/$(NAME)_$(VERSION)_armhf.deb: build/linux/$(NAME)-armhf
 	export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \
 		&& mkdir -p build/deb \
@@ -165,9 +192,11 @@ bin/gh-release:
 release: build bin/gh-release
 	rm -rf release && mkdir release
 	tar -zcf release/$(NAME)_$(VERSION)_linux_amd64.tgz -C build/linux $(NAME)-amd64
+	tar -zcf release/$(NAME)_$(VERSION)_linux_arm64.tgz -C build/linux $(NAME)-arm64
 	tar -zcf release/$(NAME)_$(VERSION)_linux_armhf.tgz -C build/linux $(NAME)-armhf
 	tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME)
 	cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb
+	cp build/deb/$(NAME)_$(VERSION)_arm64.deb release/$(NAME)_$(VERSION)_arm64.deb
 	cp build/deb/$(NAME)_$(VERSION)_armhf.deb release/$(NAME)_$(VERSION)_armhf.deb
 	cp build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm release/$(NAME)-$(VERSION)-1.x86_64.rpm
 	bin/gh-release create $(MAINTAINER)/$(REPOSITORY) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD)
@@ -176,30 +205,36 @@ release-packagecloud:
 	@$(MAKE) release-packagecloud-deb
 	@$(MAKE) release-packagecloud-rpm
 
-release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAME)_$(VERSION)_armhf.deb
+release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAME)_$(VERSION)_arm64.deb build/deb/$(NAME)_$(VERSION)_armhf.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic  build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal   build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster  build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb
-	package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster  build/deb/$(NAME)_$(VERSION)_armhf.deb
+	package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal    build/deb/$(NAME)_$(VERSION)_arm64.deb
+	package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb
 
 release-packagecloud-rpm: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7           build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
 
 validate:
 	mkdir -p validation
 	lintian build/deb/$(NAME)_$(VERSION)_amd64.deb || true
+	lintian build/deb/$(NAME)_$(VERSION)_arm64.deb || true
 	lintian build/deb/$(NAME)_$(VERSION)_armhf.deb || true
 	dpkg-deb --info build/deb/$(NAME)_$(VERSION)_amd64.deb
+	dpkg-deb --info build/deb/$(NAME)_$(VERSION)_arm64.deb
 	dpkg-deb --info build/deb/$(NAME)_$(VERSION)_armhf.deb
 	dpkg -c build/deb/$(NAME)_$(VERSION)_amd64.deb
+	dpkg -c build/deb/$(NAME)_$(VERSION)_arm64.deb
 	dpkg -c build/deb/$(NAME)_$(VERSION)_armhf.deb
 	cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_amd64.deb
+	cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_arm64.deb
 	cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_armhf.deb
 	cd validation && rpm2cpio ../build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm > $(NAME)-$(VERSION)-1.x86_64.cpio
 	ls -lah build/deb build/rpm validation
 	sha1sum build/deb/$(NAME)_$(VERSION)_amd64.deb
+	sha1sum build/deb/$(NAME)_$(VERSION)_arm64.deb
 	sha1sum build/deb/$(NAME)_$(VERSION)_armhf.deb
 	sha1sum build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
 	go get -u github.com/progrium/basht/...

README.md

@@ -18,7 +18,7 @@ for any text processing.
 ## Getting Sigil
 
 ```shell
-curl -L "https://github.com/gliderlabs/sigil/releases/download/v0.7.1/gliderlabs-sigil_0.7.1_$(uname -sm|tr \  _).tgz" \
+curl -L "https://github.com/gliderlabs/sigil/releases/download/v0.8.0/gliderlabs-sigil_0.8.0_$(uname -sm|tr \  _).tgz" \
     | tar -zxC /usr/local/bin
 ```