From 3fc235f22aa7b364d7d8b71071caecb08cef90df Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 5 Nov 2021 01:10:30 -0400 Subject: [PATCH 1/9] feat: update the release name and body after creation --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 70076f7..615ed2f 100644 --- a/Makefile +++ b/Makefile @@ -131,13 +131,19 @@ bin/gh-release: tar xf bin/gh-release.tgz -C bin chmod +x bin/gh-release -release: bin/gh-release +bin/gh-release-body: + mkdir -p bin + curl -o bin/gh-release-body "https://raw.githubusercontent.com/dokku/gh-release-body/master/gh-release-body" + chmod +x bin/gh-release-body + +release: bin/gh-release bin/gh-release-body rm -rf release && mkdir release tar -zcf release/$(NAME)_$(VERSION)_linux_$(HARDWARE).tgz -C build/linux $(NAME) tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME) cp build/deb/$(NAME)_$(VERSION)_all.deb release/$(NAME)_$(VERSION)_all.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) + bin/gh-release-body $(MAINTAINER)/$(REPOSITORY) v$(VERSION) release-packagecloud: @$(MAKE) release-packagecloud-deb From 2633fb745fd52adbae4c2f230d06c3297c9a4942 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 5 Nov 2021 01:22:28 -0400 Subject: [PATCH 2/9] feat: upgrade ci builder to ubuntu 20.04 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56809e8..685432d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ on: jobs: build: name: build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: true From 51581ea830ca687ccf6ea4857dc746f043a54b12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 06:10:59 +0000 Subject: [PATCH 3/9] chore(deps): bump golang from 1.17.2-buster to 1.17.3-buster Bumps golang from 1.17.2-buster to 1.17.3-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd33224..746de92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.2-buster +FROM golang:1.17.3-buster # hadolint ignore=DL3027 RUN apt-get update \ From e46957ef7341cef9d1b0959dba3ce96d74ecfe51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 06:10:30 +0000 Subject: [PATCH 4/9] chore(deps): bump golang from 1.17.3-buster to 1.17.6-buster Bumps golang from 1.17.3-buster to 1.17.6-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 746de92..847c5b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.3-buster +FROM golang:1.17.6-buster # hadolint ignore=DL3027 RUN apt-get update \ From 1e74a9fd445feed918602abceb1bb8eff7a2bc5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 06:10:59 +0000 Subject: [PATCH 5/9] chore(deps): bump golang from 1.17.6-buster to 1.17.7-buster Bumps golang from 1.17.6-buster to 1.17.7-buster. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 847c5b3..284030b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.6-buster +FROM golang:1.17.7-buster # hadolint ignore=DL3027 RUN apt-get update \ From 77db521496161d88834fd7e9ece527aaa74bcbd9 Mon Sep 17 00:00:00 2001 From: Ryan Gaudion <43444172+RyanGaudion@users.noreply.github.com> Date: Tue, 1 Mar 2022 18:29:30 +0000 Subject: [PATCH 6/9] Add Raspbian Bullseye --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 615ed2f..7197d1f 100644 --- a/Makefile +++ b/Makefile @@ -156,6 +156,7 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_all.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 From 8df2e245a0bd65448419256dd8a54b4145bb7041 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 5 Mar 2022 19:35:13 -0500 Subject: [PATCH 7/9] fix: add missing jq dependency to build environment --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 284030b..bd1bf54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.17.7-buster # hadolint ignore=DL3027 RUN apt-get update \ - && apt install apt-transport-https build-essential curl gnupg2 lintian rpm rsync rubygems-integration ruby-dev ruby software-properties-common sudo -qy \ + && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby software-properties-common sudo -qy \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From bc132a77717c8afcb1f16cf58202e5602d145e60 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 5 Mar 2022 21:04:32 -0500 Subject: [PATCH 8/9] chore: drop changelog The changelog is duplicated in release notes. --- CHANGELOG.md | 180 --------------------------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 17130a3..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,180 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. - -## [0.14.1](https://github.com/dokku/sshcommand/compare/v0.14.0...v0.14.1) - 2021-10-09 - -### Added - -- #71 @josegonzalez Release package for raspberry pi - -## [0.14.0](https://github.com/dokku/sshcommand/compare/v0.13.2...v0.14.0) - 2021-10-08 - -### Changed - -- #68 @josegonzalez Build universal debian package - -## [0.13.2](https://github.com/dokku/sshcommand/compare/v0.13.1...v0.13.2) - 2021-10-08 - -### Changed - -- #66 @josegonzalez Update gh-release - -## [0.13.1](https://github.com/dokku/sshcommand/compare/v0.13.0...v0.13.1) - 2021-10-08 - -### Added - -- #64 @josegonzalez Run tests on the release branch - -## [0.13.0](https://github.com/dokku/sshcommand/compare/v0.12.0...v0.13.0) - 2021-10-08 - -### Added - -- #59 @josegonzalez Add bullseye to deb release task -- #60 @josegonzalez Chown authorized_keys file as needed - -### Removed - -- #62 @josegonzalez Drop xenial support - -### Changed - -- #61 @josegonzalez Switch from CircleCI to Github Actions - -## [0.12.0](https://github.com/dokku/sshcommand/compare/v0.11.0...v0.12.0) - 2020-12-19 - -### Added - -- @josegonzalez add support for removing ssh keys by fingerprint -- @josegonzalez add support for help and version flags - -## [0.11.0](https://github.com/dokku/sshcommand/compare/v0.10.0...v0.11.0) - 2020-05-06 - -### Changed - -- @josegonzalez Avoid writing acl-add key to temporary file -- @josegonzalez Release packages for focal - -## [0.10.0](https://github.com/dokku/sshcommand/compare/v0.9.0...v0.10.0) - 2020-04-03 - -### Added -- @Filipe-Souza Ability to output JSON format in ssh keys list -- @matthewmueller Add support for Amazon Linux 2 - -### Changed -- @josegonzalez Drop unsupported debian-based operating systems -- @josegonzalez Do not release to the betafish channel - -### Fixed -- @josegonzalez Do not allow users to re-specify an ssh key under a different name -- @josegonzalez Allow user to disable name check when adding a new ssh key -- @josegonzalez Correct shellcheck issues with shellcheck 0.7.0 -- @znz Ignore options in key file - -## [0.9.0](https://github.com/dokku/sshcommand/compare/v0.8.0...v0.9.0) - 2019-09-20 - -### Added -- @josegonzalez Add ability to list a single name's keys - -## [0.8.0](https://github.com/dokku/sshcommand/compare/v0.7.0...v0.8.0) - 2019-08-10 -### Fixed -- @fruitl00p delete_user is now portable - -### Added -- @D1ceWard Added arch linux support -- @josegonzalez Move to circleci 2.0 -- @josegonzalez Run tests in docker -- @josegonzalez Release packages via CI -- @josegonzalez Add version command - -## [0.7.0](https://github.com/dokku/sshcommand/compare/v0.6.0...v0.7.0) - 2017-03-22 -### Fixed -- @callahad Only allow one key per file in acl-add. Otherwise, the additional keys get added without the sshcommand wrapper. - -### Added -- @michaelshobbs automated releases - - -## [0.6.0](https://github.com/dokku/sshcommand/compare/v0.5.0...v0.6.0) - 2016-08-26 -### Fixed -- @IlyaSemenov Fixed failing unit test for sshcommand list - -### Added -- @u2mejc Adds sshcommand list to README.md -- @IlyaSemenov Support unquoted NAME when parsing authorized_keys -- @IlyaSemenov Tests for different authorized_keys format variants -- @IlyaSemenov Compatibility with SHA256 ssh keys - -### Changed -- @IlyaSemenov Pinned base Docker image - - -## [0.5.0](https://github.com/dokku/sshcommand/compare/v0.4.0...v0.5.0) - 2016-06-30 -### Added -@u2mejc Add sshcommand-list, add clarity to help - - -## [0.4.0](https://github.com/dokku/sshcommand/compare/v0.3.0...v0.4.0) - 2016-04-03 -### Added -- @josegonzalez Add the ability to specify the key_file as an argument -- @josegonzalez Allow sourcing configuration defaults -- @josegonzalez Allow specifying custom ALLOWED_KEYS via environment variable -- @josegonzalez Allow sourcing of sshcommand as a library -- @josegonzalez Add a test for invalid os-release paths -- @josegonzalez Add support for alpine linux 3.x. Closes #16 - -### Changed -- @josegonzalez Minor formatting change -- @josegonzalez Make os-release path configurable -- @josegonzalez Avoid polluting the "global" namespace -- @josegonzalez Switch from checking for name to checking for os id -- @josegonzalez Move apt-get call up so we can cache the call - - -## [0.3.0](https://github.com/dokku/sshcommand/compare/v0.2.0...v0.3.0) - 2016-04-03 -### Fixed -- @josegonzalez Exit correctly when command is misused -- @josegonzalez Exit immediately on log-fail call - -### Added -- @josegonzalez Add a description to functions -- @josegonzalez Allow user to specify a specific bash -- @josegonzalez Include way to trace command - -### Changed -- @josegonzalez Move sshcommand logic into functions -- @josegonzalez Always use [[ instead of [ or test -- @josegonzalez Avoid global variables -- @josegonzalez Always use declare at the top of functions -- @josegonzalez Always use set -eo pipefail -- @josegonzalez Never use backticks, use $( ... ) -- @josegonzalez Use log-fail and log-verbose helpers -- @josegonzalez Always use local when setting variables -- @josegonzalez Lowercase the operating system name -- @josegonzalez Use backticks until better testing can get into place -- @josegonzalez Use proper nomenclature for variable -- @josegonzalez Use more precise argument checking -- @josegonzalez Remove errant output redirection -- @josegonzalez Shift args by 1 to simplify argument assignment -- @josegonzalez Remove case in favor of method checking via declare -- @josegonzalez Refactor help output -- @josegonzalez Use same naming schema everywhere - - -## [0.2.0](https://github.com/dokku/sshcommand/compare/v0.1.0...v0.2.0) - 2016-04-02 -### Fixed -- @michaelshobbs fix stale handle stdin. error on no fingerprint - -### Added -- @michaelshobbs add tests and make lint pass -- @michaelshobbs [ci skip] add build status to README -- @alessio Add support for SLES, and perhaps more RPM distros -- @michaelshobbs support identifiers with spaces. closes dokku/dokku#1489 -- @michaelshobbs match Debian* in f_adduser() -- Oliver Wilkie Add support for Debian-based Raspian OS - -### Changed -- @alessio Use the SLES stanza as a generic fallback -- @alessio Use double quote to prevent globbing and word splitting -- @michaelshobbs update build image in README -- @jvanbaarsen Only add SSH key if it doesn't already exists From 643aa9043ece24af662f2e6e4436739c187aef0f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 5 Mar 2022 21:17:51 -0500 Subject: [PATCH 9/9] Release 0.15.0 - #73: @josegonzalez Update the release name and body after creation - #74: @josegonzalez Upgrade ci builder to ubuntu 20.04 - #75: @dependabot chore(deps): bump golang from 1.17.2-buster to 1.17.3-buster - #78: @dependabot chore(deps): bump golang from 1.17.3-buster to 1.17.6-buster - #79: @dependabot chore(deps): bump golang from 1.17.6-buster to 1.17.7-buster - #80: RyanGaudion Add Raspbian Bullseye - #81: @josegonzalez Add missing jq dependency to build environment - #82: @josegonzalez Drop changelog --- Makefile | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7197d1f..8e455fb 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ MAINTAINER_NAME = Jose Diaz-Gonzalez REPOSITORY = sshcommand HARDWARE = $(shell uname -m) SYSTEM_NAME = $(shell uname -s | tr '[:upper:]' '[:lower:]') -BASE_VERSION ?= 0.14.1 +BASE_VERSION ?= 0.15.0 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY) PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/package.json b/package.json index e86347f..31aee37 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sshcommand", - "version": "0.14.1", + "version": "0.15.0", "description": "Turn SSH into a thin client specifically for your app", "global": "true", "install": "cp sshcommand /usr/local/bin && chmod +x /usr/local/bin/sshcommand",