Maintenance release for 2022

.drone.yml

@@ -0,0 +1,69 @@
+kind: pipeline
+type: exec
+name: exec-runner
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: integration-tests
+    environment:
+    commands:
+      - make clean
+      - make build lint
+      - make test
+      - make integration
+    when:
+      event:
+        - pull_request
+        - push
+
+---
+kind: pipeline
+type: docker
+name: docker-runner
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: prepare-release
+    image: golang:1.18
+    commands:
+      - |
+        go build \
+          -o build/containerpilot \
+          -ldflags \
+            "-X github.com/greenbaum/containerpilot/version.GitHash=$(git rev-parse --short HEAD) \
+             -X github.com/greenbaum/containerpilot/version.Version=${DRONE_TAG}"
+      - mkdir release && cd build && tar -czf ../release/containerpilot-${DRONE_TAG}.tar.gz containerpilot
+      - cd ../release && sha1sum containerpilot-${DRONE_TAG}.tar.gz > containerpilot-${DRONE_TAG}.sha1.txt
+    when:
+      event:
+        - tag
+
+  - name: publish-release
+    image: plugins/github-release
+    settings:
+      api_key:
+        from_secret: github_api-key
+      files:
+        - release/containerpilot-${DRONE_TAG}.tar.gz
+        - release/containerpilot-${DRONE_TAG}.sha1.txt
+      title: "New release: version ${DRONE_TAG}"
+      base_url: greenbaum/containerpilot
+    when:
+      event:
+        - tag
+    depends_on:
+      - prepare-release
+
+---
+kind: secret
+name: github_api-key
+get:
+  path: secret/data/drone/github
+  name: api-key
+

.envrc

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# ^ added for shellcheck and file-type detection
+
+# Watch & reload direnv on change
+cd devshell || exit
+watch_file devshell.toml
+
+if [[ $(type -t use_flake) != function ]]; then
+  echo "ERROR: use_flake function missing."
+  echo "Please update direnv to v2.30.0 or later."
+  exit 1
+fi
+use flake

.gitignore

@@ -41,3 +41,6 @@ cover.html
 # IDE files
 .idea
 *.iml
+
+# Nix files
+.direnv

CONTRIBUTING.md

@@ -1,9 +1,9 @@
 ## Contributing
 
-ContainerPilot is open source under the [Mozilla Public License 2.0](https://github.com/joyent/containerpilot/blob/master/LICENSE).
+ContainerPilot is open source under the [Mozilla Public License 2.0](https://github.com/tritondatacenter/containerpilot/blob/master/LICENSE).
 
-Pull requests on GitHub are welcome on any issue. If you'd like to propose a new feature, it's often a good idea to discuss the design by opening an issue first. We'll mark these as [`proposals`](https://github.com/joyent/containerpilot/issues?q=is%3Aopen+is%3Aissue+label%3Aproposal), and roadmap items will be maintained as [`enhancements`](https://github.com/joyent/containerpilot/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement).
+Pull requests on GitHub are welcome on any issue. If you'd like to propose a new feature, it's often a good idea to discuss the design by opening an issue first. We'll mark these as [`proposals`](https://github.com/tritondatacenter/containerpilot/issues?q=is%3Aopen+is%3Aissue+label%3Aproposal), and roadmap items will be maintained as [`enhancements`](https://github.com/tritondatacenter/containerpilot/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement).
 
-Many of our contributors have never contributed to an open source golang project before. If you are looking for a good first contribution, check out the [`help wanted` label](https://github.com/joyent/containerpilot/issues?q=is%3Aopen+is%3Aissue+label%3A"help+wanted"); not that we don't want help anywhere else of course! But these are low-hanging fruit to get started.
+Many of our contributors have never contributed to an open source golang project before. If you are looking for a good first contribution, check out the [`help wanted` label](https://github.com/tritondatacenter/containerpilot/issues?q=is%3Aopen+is%3Aissue+label%3A"help+wanted"); not that we don't want help anywhere else of course! But these are low-hanging fruit to get started.
 
-Please make sure you've added tests for any new feature or tests that prove a bug has been fixed. Run `make lint` before submitting your PR. We test ContainerPilot on [TravisCI](https://travis-ci.org/joyent/containerpilot).
+Please make sure you've added tests for any new feature or tests that prove a bug has been fixed. Run `make lint` before submitting your PR. We test ContainerPilot on [TravisCI](https://travis-ci.org/tritondatacenter/containerpilot).

Dockerfile

@@ -1,15 +1,20 @@
-FROM golang:1.9
+FROM golang:1.19
 
-ENV CONSUL_VERSION=1.0.0
-ENV GLIDE_VERSION=0.12.3
+ENV CONSUL_VERSION=1.13.3
 
 RUN  apt-get update \
      && apt-get install -y unzip \
-     && go get github.com/golang/lint/golint \
-     && curl -Lo /tmp/glide.tgz "https://github.com/Masterminds/glide/releases/download/v${GLIDE_VERSION}/glide-v${GLIDE_VERSION}-linux-amd64.tar.gz" \
-     && tar -C /usr/bin -xzf /tmp/glide.tgz --strip=1 linux-amd64/glide \
-     && curl --fail -Lso consul.zip "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" \
-     && unzip consul.zip -d /usr/bin
+     && go install honnef.co/go/tools/cmd/staticcheck@latest
+
+
+RUN export CONSUL_CHECKSUM=5370b0b5bf765530e28cb80f90dcb47bd7d6ba78176c1ab2430f56e460ed279c \
+    && export archive=consul_${CONSUL_VERSION}_linux_amd64.zip \
+    && curl -Lso /tmp/${archive} https://releases.hashicorp.com/consul/${CONSUL_VERSION}/${archive} \
+    && echo "${CONSUL_CHECKSUM}  /tmp/${archive}" | sha256sum -c \
+    && cd /bin \
+    && unzip /tmp/${archive} \
+    && chmod +x /bin/consul \
+    && rm /tmp/${archive}
 
 ENV CGO_ENABLED 0
-ENV GOPATH /go:/cp
+ENV GOPATH /go

README.md

@@ -2,13 +2,13 @@
 
 *An init system for cloud-native distributed applications that automates the process of service discovery, configuration, and lifecycle management inside the container, so you can focus on your apps.*
 
-[![Build Status](https://travis-ci.org/joyent/containerpilot.svg)](https://travis-ci.org/joyent/containerpilot)
-[![MPL licensed](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://github.com/joyent/containerpilot/blob/master/LICENSE)
-[![GoDoc](https://godoc.org/github.com/joyent/containerpilot?status.svg)](https://godoc.org/github.com/joyent/containerpilot)
+[![Build Status](https://drone.greenbaum.cloud/api/badges/greenbaum.cloud/containerpilot/status.svg)](https://drone.greenbaum.cloud/greenbaum.cloud/containerpilot)
+[![MPL licensed](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://github.com/tritondatacenter/containerpilot/blob/master/LICENSE)
+[![GoDoc](https://godoc.org/github.com/tritondatacenter/containerpilot?status.svg)](https://godoc.org/github.com/tritondatacenter/containerpilot)
 
 ## What is ContainerPilot?
 
-Orchestration is the automation of the operations of an application. Most application require operational tasks like connecting them to related components ([WordPress needs to know where it's MySQL and Memcached servers are, for example](https://www.joyent.com/blog/wordpress-on-autopilot)), and some applications require special attention as they start up or shut down to be sure they bootstrap correctly or persist their data. We can do all that by hand, but modern applications automate those tasks in code. That's called "orchestration."
+Orchestration is the automation of the operations of an application. Most application require operational tasks like connecting them to related components ([WordPress needs to know where it's MySQL and Memcached servers are, for example](https://www.tritondatacenter.com/blog/wordpress-on-autopilot)), and some applications require special attention as they start up or shut down to be sure they bootstrap correctly or persist their data. We can do all that by hand, but modern applications automate those tasks in code. That's called "orchestration."
 
 To make this work, every application needs to do the following (at a minimum):
 
@@ -35,11 +35,11 @@ open http://localhost
 
 This application blueprint demonstrates using ContainerPilot to update Nginx upstream configuration at runtime. Try scaling up via `docker-compose scale hello=2 world=3` to see the Nginx configuration updated.
 
-You can also [download](https://github.com/joyent/containerpilot/releases) the latest release of ContainerPilot from GitHub.
+You can also [download](https://github.com/tritondatacenter/containerpilot/releases) the latest release of ContainerPilot from GitHub.
 
 ## Documentation
 
-Documentation for ContainerPilot and where it fits with the rest of the Triton ecosystem can be found at [www.joyent.com/containerpilot](https://www.joyent.com/containerpilot). The index below links to the documentation in this repo for convenience.
+Documentation for ContainerPilot and where it fits with the rest of the Triton ecosystem can be found at [www.tritondatacenter.com/containerpilot](https://www.tritondatacenter.com/containerpilot). The index below links to the documentation in this repo for convenience.
 
 [Lifecycle](./docs/10-lifecycle.md)
 - [What is a job?](./docs/10-lifecycle.md#what-is-a-job)
@@ -100,19 +100,19 @@ Configuration
 - [Contributing](./docs/40-support.md#contributing)
 - [Backwards compatibility](./docs/40-support.md#backwards-compatibility)
 
-You might also read [our guide building self-operating applications with ContainerPilot](https://www.joyent.com/blog/applications-on-autopilot) and look at the examples below.
+You might also read [our guide building self-operating applications with ContainerPilot](https://www.tritondatacenter.com/blog/applications-on-autopilot) and look at the examples below.
 
 ## Examples
 
 We've published a number of example applications demonstrating how ContainerPilot works.
 
-- [Applications on autopilot: a guide to how to build self-operating applications with ContainerPilot](https://www.joyent.com/blog/applications-on-autopilot)
-- [MySQL (Percona Server) with auto scaling and fail-over](https://www.joyent.com/blog/dbaas-simplicity-no-lock-in)
-- [Autopilot Pattern WordPress](https://www.joyent.com/blog/wordpress-on-autopilot)
-- [ELK stack](https://www.joyent.com/blog/docker-log-drivers)
-- [Node.js + Nginx + Couchbase](https://www.joyent.com/blog/docker-nodejs-nginx-nosql-autopilot)
+- [Applications on autopilot: a guide to how to build self-operating applications with ContainerPilot](https://www.tritondatacenter.com/blog/applications-on-autopilot)
+- [MySQL (Percona Server) with auto scaling and fail-over](https://www.tritondatacenter.com/blog/dbaas-simplicity-no-lock-in)
+- [Autopilot Pattern WordPress](https://www.tritondatacenter.com/blog/wordpress-on-autopilot)
+- [ELK stack](https://www.tritondatacenter.com/blog/docker-log-drivers)
+- [Node.js + Nginx + Couchbase](https://www.tritondatacenter.com/blog/docker-nodejs-nginx-nosql-autopilot)
 - [CloudFlare DNS and CDN with dynamic origins](https://github.com/autopilotpattern/cloudflare)
 - [Consul, running as an HA raft](https://github.com/autopilotpattern/consul)
 - [Couchbase](https://github.com/autopilotpattern/couchbase)
-- [Mesos on Joyent Triton](https://www.joyent.com/blog/mesos-by-the-pound)
-- [Nginx with dynamic upstreams](https://www.joyent.com/blog/dynamic-nginx-upstreams-with-containerbuddy)
+- [Mesos on Joyent Triton](https://www.tritondatacenter.com/blog/mesos-by-the-pound)
+- [Nginx with dynamic upstreams](https://www.tritondatacenter.com/blog/dynamic-nginx-upstreams-with-containerbuddy)

client/README.md

@@ -1,3 +1,3 @@
 ## client
 
-[![GoDoc](https://godoc.org/github.com/joyent/containerpilot?status.svg)](https://godoc.org/github.com/joyent/containerpilot/client)
+[![GoDoc](https://godoc.org/github.com/tritondatacenter/containerpilot?status.svg)](https://godoc.org/github.com/tritondatacenter/containerpilot/client)

client/client.go

@@ -14,7 +14,8 @@ import (
 // requests out to a ContainerPilot process's control socket.
 type HTTPClient struct {
 	http.Client
-	socketPath string
+	// staticcheck U1000 field is unused
+	//socketPath string
 }
 
 var socketType = "unix"

commands/README.md

@@ -1,3 +1,3 @@
 ## commands
 
-[![GoDoc](https://godoc.org/github.com/joyent/containerpilot?status.svg)](https://godoc.org/github.com/joyent/containerpilot/commands)
+[![GoDoc](https://godoc.org/github.com/tritondatacenter/containerpilot?status.svg)](https://godoc.org/github.com/tritondatacenter/containerpilot/commands)

commands/args.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/joyent/containerpilot/config/decode"
+	"github.com/tritondatacenter/containerpilot/config/decode"
 )
 
 // ParseArgs parses the executable and its arguments from supported

commands/commands.go

@@ -16,7 +16,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/joyent/containerpilot/events"
+	"github.com/tritondatacenter/containerpilot/events"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -30,6 +30,8 @@ type Command struct {
 	logger  log.Entry
 	lock    *sync.Mutex
 	fields  log.Fields
+	UID     int
+	GID     int
 }
 
 // NewCommand parses JSON config into a Command
@@ -101,7 +103,20 @@ func (c *Command) Run(pctx context.Context, bus *events.EventBus) {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	}
+
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
+	if os.Getuid() == 0 {
+		if c.UID != 0 && c.GID != 0 {
+			cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(c.UID), Gid: uint32(c.GID)}
+		} else if c.UID != 0 {
+			cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(c.UID)}
+		} else if c.GID != 0 {
+			cmd.SysProcAttr.Credential = &syscall.Credential{Gid: uint32(c.GID)}
+		}
+	} else {
+		log.Debugf("%s.Skipping uid and gid (ContainerPilot is not running as root)", c.Name)
+	}
+
 	c.Cmd = cmd
 	ctx, cancel := getContext(pctx, c.Timeout)
 
@@ -126,8 +141,8 @@ func (c *Command) Run(pctx context.Context, bus *events.EventBus) {
 		defer log.Debugf("%s.Run end", c.Name)
 		if err := c.Cmd.Start(); err != nil {
 			log.Errorf("unable to start %s: %v", c.Name, err)
-			bus.Publish(events.Event{events.ExitFailed, c.Name})
-			bus.Publish(events.Event{events.Error, err.Error()})
+			bus.Publish(events.Event{Code: events.ExitFailed, Source: c.Name})
+			bus.Publish(events.Event{Code: events.Error, Source: err.Error()})
 			return
 		}
 
@@ -150,12 +165,12 @@ func (c *Command) Run(pctx context.Context, bus *events.EventBus) {
 		// we'll return from Wait() and publish events
 		if err := c.Cmd.Wait(); err != nil {
 			log.Errorf("%s exited with error: %v", c.Name, err)
-			bus.Publish(events.Event{events.ExitFailed, c.Name})
-			bus.Publish(events.Event{events.Error,
-				fmt.Errorf("%s: %s", c.Name, err).Error()})
+			bus.Publish(events.Event{Code: events.ExitFailed, Source: c.Name})
+			bus.Publish(events.Event{Code: events.Error,
+				Source: fmt.Errorf("%s: %s", c.Name, err).Error()})
 		} else {
 			log.Debugf("%s exited without error", c.Name)
-			bus.Publish(events.Event{events.ExitSuccess, c.Name})
+			bus.Publish(events.Event{Code: events.ExitSuccess, Source: c.Name})
 		}
 	}()
 }

commands/commands_test.go

@@ -7,15 +7,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/joyent/containerpilot/events"
+	"github.com/tritondatacenter/containerpilot/events"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestCommandRunWithTimeoutZero(t *testing.T) {
 	cmd, _ := NewCommand("sleep 2", time.Duration(0), nil)
 	got := runtestCommandRun(cmd)
-	timedout := events.Event{events.ExitFailed, "sleep"}
+	timedout := events.Event{Code: events.ExitFailed, Source: "sleep"}
 	if got[timedout] != 1 {
 		t.Fatalf("stopped command prior to test timeout, got events %v", got)
 	}
@@ -25,9 +25,9 @@ func TestCommandRunWithTimeoutKilled(t *testing.T) {
 	cmd, _ := NewCommand("sleep 2", time.Duration(100*time.Millisecond), nil)
 	cmd.Name = t.Name()
 	got := runtestCommandRun(cmd)
-	testTimeout := events.Event{events.TimerExpired, "DebugSubscriberTimeout"}
-	expired := events.Event{events.ExitFailed, t.Name()}
-	errMsg := events.Event{events.Error, fmt.Sprintf("%s: signal: killed", cmd.Name)}
+	testTimeout := events.Event{Code: events.TimerExpired, Source: "DebugSubscriberTimeout"}
+	expired := events.Event{Code: events.ExitFailed, Source: t.Name()}
+	errMsg := events.Event{Code: events.Error, Source: fmt.Sprintf("%s: signal: killed", cmd.Name)}
 	if got[testTimeout] > 0 || got[expired] != 1 || got[errMsg] != 1 {
 		t.Fatalf("expected:\n%v\n%v\ngot events:\n%v", expired, errMsg, got)
 	}
@@ -38,9 +38,9 @@ func TestCommandRunChildrenKilled(t *testing.T) {
 		time.Duration(100*time.Millisecond), nil)
 	cmd.Name = t.Name()
 	got := runtestCommandRun(cmd)
-	testTimeout := events.Event{events.TimerExpired, "DebugSubscriberTimeout"}
-	expired := events.Event{events.ExitFailed, t.Name()}
-	errMsg := events.Event{events.Error, fmt.Sprintf("%s: signal: killed", cmd.Name)}
+	testTimeout := events.Event{Code: events.TimerExpired, Source: "DebugSubscriberTimeout"}
+	expired := events.Event{Code: events.ExitFailed, Source: t.Name()}
+	errMsg := events.Event{Code: events.Error, Source: fmt.Sprintf("%s: signal: killed", cmd.Name)}
 	if got[testTimeout] > 0 || got[expired] != 1 || got[errMsg] != 1 {
 		t.Fatalf("expected:\n%v\n%v\ngot events:\n%v", expired, errMsg, got)
 	}
@@ -49,8 +49,8 @@ func TestCommandRunChildrenKilled(t *testing.T) {
 func TestCommandRunExecFailed(t *testing.T) {
 	cmd, _ := NewCommand("./testdata/test.sh failStuff --debug", time.Duration(0), nil)
 	got := runtestCommandRun(cmd)
-	failed := events.Event{events.ExitFailed, "./testdata/test.sh"}
-	errMsg := events.Event{events.Error, "./testdata/test.sh: exit status 255"}
+	failed := events.Event{Code: events.ExitFailed, Source: "./testdata/test.sh"}
+	errMsg := events.Event{Code: events.Error, Source: "./testdata/test.sh: exit status 255"}
 	if got[failed] != 1 || got[errMsg] != 1 {
 		t.Fatalf("expected:\n%v\n%v\ngot events:\n%v", failed, errMsg, got)
 	}
@@ -59,9 +59,9 @@ func TestCommandRunExecFailed(t *testing.T) {
 func TestCommandRunExecInvalid(t *testing.T) {
 	cmd, _ := NewCommand("./testdata/invalidCommand", time.Duration(0), nil)
 	got := runtestCommandRun(cmd)
-	failed := events.Event{events.ExitFailed, "./testdata/invalidCommand"}
-	errMsg := events.Event{events.Error,
-		"fork/exec ./testdata/invalidCommand: no such file or directory"}
+	failed := events.Event{Code: events.ExitFailed, Source: "./testdata/invalidCommand"}
+	errMsg := events.Event{Code: events.Error,
+		Source: "fork/exec ./testdata/invalidCommand: no such file or directory"}
 	if got[failed] != 1 || got[errMsg] != 1 {
 		t.Fatalf("expected:\n%v\n%v\ngot events:\n%v", failed, errMsg, got)
 	}

commands/testdata/test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 trap 'exit 2' SIGTERM
 

config/README.md

@@ -1,3 +1,3 @@
 ## config
 
-[![GoDoc](https://godoc.org/github.com/joyent/containerpilot?status.svg)](https://godoc.org/github.com/joyent/containerpilot/config)
+[![GoDoc](https://godoc.org/github.com/tritondatacenter/containerpilot?status.svg)](https://godoc.org/github.com/tritondatacenter/containerpilot/config)