Merge remote-tracking branch 'upstream/master' into svc-args

.. include the new changes in usptream into this PR.

Author: rebornplusplus

.github/workflows/binaries.yml

@@ -0,0 +1,72 @@
+name: Binaries
+
+on:
+  push:
+    tags: [v*]
+    branches: [master]
+  pull_request:
+    branches: [master]
+  release:
+    types: [published]
+
+jobs:
+  create-binaries:
+    strategy:
+      matrix:
+        goos: [linux]
+        goarch: [amd64, arm64, ppc64le, riscv64, s390x]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: stable  # latest stable version of Go
+
+    - name: Build binary and create archive
+      id: build
+      env:
+        GOOS: ${{ matrix.goos }}
+        GOARCH: ${{ matrix.goarch }}
+        CGO_ENABLED: "0"
+      run: |
+        echo Generating version file
+        go generate ./cmd
+
+        echo Building for $GOOS $GOARCH
+        go build -trimpath -ldflags='-s -w' -o dist/build/pebble ./cmd/pebble
+
+        # Get version via "pebble version" to ensure it matches that exactly
+        PEBBLE_VERSION=$(GOOS=linux GOARCH=amd64 go run ./cmd/pebble version | awk '/client/ { print $2 }')
+
+        ARCHIVE_FILE=pebble_${PEBBLE_VERSION}_${GOOS}_${GOARCH}.tar.gz
+        echo Creating archive $ARCHIVE_FILE
+        cp COPYING dist/build
+        cp README.md dist/build
+        tar -czf dist/$ARCHIVE_FILE -C dist/build .
+
+        # Share variables with subsequent steps
+        echo "ARCHIVE_FILE=${ARCHIVE_FILE}" >>$GITHUB_OUTPUT
+        echo "PEBBLE_VERSION=${PEBBLE_VERSION}" >>$GITHUB_OUTPUT
+
+    - name: Upload archive as Actions artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ steps.build.outputs.ARCHIVE_FILE }}
+        path: dist/${{ steps.build.outputs.ARCHIVE_FILE }}
+
+    - name: Upload archive to release
+      env:
+        ARCHIVE_FILE: ${{ steps.build.outputs.ARCHIVE_FILE }}
+        PEBBLE_VERSION: ${{ steps.build.outputs.PEBBLE_VERSION }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      if: ${{ github.event_name == 'release' }}
+      run: |
+        echo Uploading $ARCHIVE_FILE to release $PEBBLE_VERSION
+        gh release upload $PEBBLE_VERSION dist/$ARCHIVE_FILE

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
     name: Go ${{ matrix.go }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Go
       uses: actions/setup-go@v3
@@ -36,7 +36,7 @@ jobs:
     name: Root Tests
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Go
       uses: actions/setup-go@v3
@@ -59,7 +59,7 @@ jobs:
     name: Format check
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Go
       uses: actions/setup-go@v3

.gitignore

@@ -7,3 +7,5 @@ cmd/VERSION
 .idea
 .vscode
 /pebble
+
+dist/

HACKING.md

@@ -1,5 +1,11 @@
 # Hacking on Pebble
 
+- [Running the daemon](#running-the-daemon)
+- [Using the CLI client](#using-the-cli-client)
+- [Using Curl to hit the API](#using-curl-to-hit-the-api)
+- [Running the tests](#running-the-tests)
+- [Creating a release](#creating-a-release)
+
 Hacking on Pebble is easy. It's written in Go, so install or [download](https://golang.org/dl/) a copy of the latest version of Go. Pebble uses [Go modules](https://golang.org/ref/mod) for managing dependencies, so all of the standard Go tooling just works.
 
 To compile and run Pebble, use the `go run` command on the `cmd/pebble` directory. The first time you run it, it will download dependencies and build packages, so will take a few seconds (but after that be very fast):
@@ -127,4 +133,16 @@ ok      github.com/canonical/pebble/client  (cached)
 ?       github.com/canonical/pebble/cmd [no test files]
 ok      github.com/canonical/pebble/cmd/pebble  0.165s
 ...
-```
+```
+
+
+## Creating a release
+
+To create a new tagged release, go to the [GitHub Releases page](https://github.com/canonical/pebble/releases) and:
+
+- Click "Create a new release"
+- Enter the version tag (eg: `v1.2.3`) and select "Create new tag: on publish"
+- Enter a release title: include the version tag and a short summary of the release
+- Write release notes: describe new features and bug fixes, and include a link to the full list of commits
+
+Binaries will be created and uploaded automatically to this release by the [release.yml](https://github.com/canonical/pebble/blob/master/.github/workflows/release.yml) GitHub Actions job.

README.md

@@ -532,6 +532,10 @@ services:
         # half a minute ("30s").
         backoff-limit: <duration>
 
+        # (Optional) The amount of time afforded to this service to handle
+        # SIGTERM and exit gracefully before SIGKILL terminates it forcefully.
+        # Default is 5 seconds ("5s").
+        kill-delay: <duration>
 
 # (Optional) A list of health checks managed by this configuration layer.
 checks:
@@ -559,7 +563,7 @@ checks:
         period: <duration>
 
         # (Optional) If this time elapses before a single check operation has
-        # finished, it is cancelled and considered an error. Must not be less
+        # finished, it is cancelled and considered an error. Must be less
         # than the period, and must not be zero. Default is "3s".
         timeout: <duration>
 

cmd/mkversion.sh

@@ -19,11 +19,11 @@ set -e
 #   that dh-golang creates and that only contains a subset of the
 #   files of the toplevel buildir. 
 PKG_BUILDDIR=$(dirname "$0")/..
-GO_GENERATE_BUILDDIR="$(pwd)"
+GO_GENERATE_BUILDDIR="$(pwd)/cmd"
 
 # run from "go generate" adjust path
 if [ "$GOPACKAGE" = "cmd" ]; then
-    GO_GENERATE_BUILDDIR="$(pwd)/.."
+    GO_GENERATE_BUILDDIR="$(pwd)"
 fi
 
 OUTPUT_ONLY=false
@@ -43,7 +43,7 @@ if [ -z "$v" ]; then
     if command -v git >/dev/null; then
         # not using "--dirty" here until the following bug is fixed:
         # https://bugs.launchpad.net/snapcraft/+bug/1662388
-        v="$(git describe --always | sed -e 's/-/+git/;y/-/./' )"
+        v="$(git describe --tags --always | sed -e 's/-/+git/;y/-/./' )"
         o=git
     fi
 fi

cmd/pebble/cmd_add.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/jessevdk/go-flags"
+	"github.com/canonical/go-flags"
 
 	"github.com/canonical/pebble/client"
 )

cmd/pebble/cmd_autostart.go

@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/jessevdk/go-flags"
+	"github.com/canonical/go-flags"
 
 	"github.com/canonical/pebble/client"
 )

cmd/pebble/cmd_changes.go

@@ -19,7 +19,7 @@ import (
 	"regexp"
 	"sort"
 
-	"github.com/jessevdk/go-flags"
+	"github.com/canonical/go-flags"
 
 	"github.com/canonical/pebble/client"
 )

cmd/pebble/cmd_checks.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/jessevdk/go-flags"
+	"github.com/canonical/go-flags"
 
 	"github.com/canonical/pebble/client"
 )