From 42ae6469600d21f4ac796b53ba63304f05ff29cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 09:26:10 +0000 Subject: [PATCH 01/10] chore(deps): bump golang from 1.17.7-buster to 1.17.8-buster Bumps golang from 1.17.7-buster to 1.17.8-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index c396cc3..2414c69 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ -FROM golang:1.17.7-buster +FROM golang:1.17.8-buster RUN apt-get update \ && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ From f0b1d8bdfe1aec5ccb42fb59073dc666df8af5e1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 7 Mar 2022 23:52:35 -0500 Subject: [PATCH 02/10] feat: publish armhf package to ubuntu/focal --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f3276a6..dd8c4ba 100644 --- a/Makefile +++ b/Makefile @@ -212,6 +212,7 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM 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)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_armhf.deb From c60b392c74fad165085441e4d808c324c867d1c4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 8 Mar 2022 00:08:23 -0500 Subject: [PATCH 03/10] feat: publish armhf package to ubuntu/bionic --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index dd8c4ba..617c60b 100644 --- a/Makefile +++ b/Makefile @@ -212,6 +212,7 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM 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)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_armhf.deb From cf81313904f521dac5752855538b5807010ffed8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 8 Mar 2022 00:55:33 -0500 Subject: [PATCH 04/10] chore: drop arm/bionic as we can't test dokku on that platform --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 617c60b..dd8c4ba 100644 --- a/Makefile +++ b/Makefile @@ -212,7 +212,6 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM 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)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_armhf.deb From 6ac413b6e53c74c327b385c0096b12b04e52d825 Mon Sep 17 00:00:00 2001 From: Daijiro Chiba Date: Tue, 10 May 2022 13:36:55 +0900 Subject: [PATCH 05/10] In public go repository, specify the full path in the module directive of go.mod. --- go.mod | 3 +-- go.sum | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/go.mod b/go.mod index acf5a9e..ab672da 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,10 @@ -module sigil +module github.com/gliderlabs/sigil go 1.17 require ( github.com/dustin/go-jsonpointer v0.0.0-20160814072949-ba0abeacc3dc github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 - github.com/gliderlabs/sigil v0.6.0 github.com/jmespath/go-jmespath v0.4.0 github.com/mgood/go-posix v0.0.0-20150821180505-948c005421f5 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 46cca1c..e13030f 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,6 @@ github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad h1:Qk76DOWdOp+GlyDKB github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad/go.mod h1:mPKfmRa823oBIgl2r20LeMSpTAteW5j7FLkc0vjmzyQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/gliderlabs/sigil v0.6.0 h1:nrkh9J1/izJtWuOcV9C+cLeNVYcqWCMCeq+MIIdXDmQ= -github.com/gliderlabs/sigil v0.6.0/go.mod h1:1h7H4biRwXmWY82OZkXIQp8WTwxX5/TwJPwVNKT1J2E= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= From 395803ed96d366400fa6b5fa8e8c142485bd363d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 10 May 2022 17:49:42 -0400 Subject: [PATCH 06/10] Publish package for Ubuntu 22.04 Refs dokku/dokku#5123 --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index dd8c4ba..eda9c12 100644 --- a/Makefile +++ b/Makefile @@ -208,11 +208,14 @@ release-packagecloud: 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)/ubuntu/jammy 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)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_arm64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_arm64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_armhf.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_armhf.deb From f1ebd3c04c3e13c71781f4ee32634a55b7e99b9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 21:54:37 +0000 Subject: [PATCH 07/10] chore(deps): bump golang from 1.17.8-buster to 1.18.1-buster Bumps golang from 1.17.8-buster to 1.18.1-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index 2414c69..8f39091 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ -FROM golang:1.17.8-buster +FROM golang:1.18.1-buster RUN apt-get update \ && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ From ece48b0659f333be239ea7fefee76c6ef7b6eaac Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 10 May 2022 18:00:15 -0400 Subject: [PATCH 08/10] fix: use newer method of installing basht --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eda9c12..8a9124a 100644 --- a/Makefile +++ b/Makefile @@ -242,7 +242,7 @@ validate: 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/... + go install github.com/progrium/basht/...@latest basht tests/*.bash prebuild: From 1578e66455b57a6c8b77a06d0056fbda038d46c4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 10 May 2022 19:04:19 -0400 Subject: [PATCH 09/10] chore: update go modules --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ab672da..cb663b7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/gliderlabs/sigil -go 1.17 +go 1.18 require ( github.com/dustin/go-jsonpointer v0.0.0-20160814072949-ba0abeacc3dc From 14a25e2a276d33f562afb8cfd25e43006ae22d79 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 10 May 2022 19:45:11 -0400 Subject: [PATCH 10/10] Release 0.9.0 #### Added - #74 @josegonzalez Publish armhf package to ubuntu/focal - #78 @josegonzalez Publish package for Ubuntu 22.04 #### Changed - #73 @dependabot chore(deps): bump golang from 1.17.7-buster to 1.17.8-buster - #76 @dependabot chore(deps): bump golang from 1.17.8-buster to 1.18.1-buster - #77 @chibadaijiro Specify the full path in the module directive of go.mod. - #79 @josegonzalez Update go modules --- CHANGELOG.md | 14 ++++++++++++++ Makefile | 2 +- README.md | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d1d165..9ea00c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ # Change Log All notable changes to this project will be documented in this file. +## [v0.9.0](https://github.com/gliderlabs/registrator/compare/v0.8.1...v0.9.0) - 2022-05-10 + +#### Added + +- #74 @josegonzalez Publish armhf package to ubuntu/focal +- #78 @josegonzalez Publish package for Ubuntu 22.04 + +#### Changed + +- #73 @dependabot chore(deps): bump golang from 1.17.7-buster to 1.17.8-buster +- #76 @dependabot chore(deps): bump golang from 1.17.8-buster to 1.18.1-buster +- #77 @chibadaijiro Specify the full path in the module directive of go.mod. +- #79 @josegonzalez Update go modules + ## [v0.8.1](https://github.com/gliderlabs/registrator/compare/v0.8.0...v0.8.1) - 2022-03-05 #### Added diff --git a/Makefile b/Makefile index 8a9124a..43fc88e 100644 --- a/Makefile +++ b/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.8.1 +BASE_VERSION ?= 0.9.0 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY) PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish BINARY_NAME = sigil diff --git a/README.md b/README.md index 5d7b585..97d7e45 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ for any text processing. ## Getting Sigil ```shell -curl -L "https://github.com/gliderlabs/sigil/releases/download/v0.8.1/gliderlabs-sigil_0.8.1_$(uname -sm|tr \ _).tgz" \ +curl -L "https://github.com/gliderlabs/sigil/releases/download/v0.9.0/gliderlabs-sigil_0.9.0_$(uname -sm|tr \ _).tgz" \ | tar -zxC /usr/local/bin ```