Merge pull request #5 from antoniomika/am/updates

Update versions of dependencies and tools

Author: antoniomika

.dockerignore

@@ -1,6 +1,5 @@
 /.dockerignore
 /Dockerfile
-/Dockerfile.buildkit
 /.git/
 /.github/
 /.gitignore

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: antoniomika

.github/workflows/docker.yml

@@ -15,6 +15,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.18
     - name: Lint the codebase
       uses: golangci/golangci-lint-action@v2
       with:
@@ -49,6 +53,7 @@ jobs:
 
         DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
         REF="${BRANCH_NAME:-main}"
+        OTHER_TAGS=()
         OTHER_ARGS=""
         OTHER_PUSH_ARGS=""
 
@@ -61,9 +66,9 @@ jobs:
 
         if [[ "${GITHUB_REF}" =~ ^refs\/tags\/v.*$ ]]; then
           REF="${GITHUB_REF//refs\/tags\/v}"
-          OTHER_ARGS="${OTHER_ARGS} -t ${GITHUB_REPOSITORY}:${GITHUB_REF//refs\/tags\/}"
+          OTHER_TAGS+=("${GITHUB_REF//refs\/tags\/}")
           if ! [[ ${GITHUB_REF} =~ ^refs\/tags\/v.*-.*$ ]]; then
-            OTHER_ARGS="${OTHER_ARGS} -t ${GITHUB_REPOSITORY}:latest"
+            OTHER_TAGS+=("latest")
           fi
         fi
 
@@ -76,16 +81,24 @@ jobs:
           fi
         fi
 
+        OTHER_TAGS+=("${GITHUB_SHA}" "${REF}")
+
+        MAIN_IMAGE_TAGS=""
+        BUILD_IMAGE_TAGS=""
+
+        for TAG in ${OTHER_TAGS[@]}; do
+          MAIN_IMAGE_TAGS="${MAIN_IMAGE_TAGS} -t ${GITHUB_REPOSITORY}:${TAG}"
+          BUILD_IMAGE_TAGS="${BUILD_IMAGE_TAGS} -t ${GITHUB_REPOSITORY}-build-image:${TAG}"
+        done
+
         docker buildx build \
           --target release \
           --cache-from ${GITHUB_REPOSITORY}-cache \
           --build-arg VERSION=${REF} \
           --build-arg COMMIT=${GITHUB_SHA} \
           --build-arg DATE=${DATE} \
           --build-arg REPOSITORY=${GITHUB_REPOSITORY} \
-          -t ${GITHUB_REPOSITORY}:${GITHUB_SHA} \
-          -t ${GITHUB_REPOSITORY}:${REF} \
-          ${OTHER_ARGS} ${OTHER_PUSH_ARGS} .
+          ${MAIN_IMAGE_TAGS} ${OTHER_ARGS} ${OTHER_PUSH_ARGS} .
 
         if [[ "${OTHER_ARGS}" != *"--load"* ]]; then
           docker buildx build \
@@ -95,9 +108,18 @@ jobs:
             --build-arg COMMIT=${GITHUB_SHA} \
             --build-arg DATE=${DATE} \
             --build-arg REPOSITORY=${GITHUB_REPOSITORY} \
-            -t ${GITHUB_REPOSITORY}:${GITHUB_SHA} \
-            -t ${GITHUB_REPOSITORY}:${REF} \
-            --load .
+            ${MAIN_IMAGE_TAGS} --load .
+        fi
+
+        if [[ "${GITHUB_ACTOR}" == "${GITHUB_REPOSITORY%/*}" ]]; then
+          docker buildx build \
+            --target build-image \
+            --cache-from ${GITHUB_REPOSITORY}-cache \
+            --build-arg VERSION=${REF} \
+            --build-arg COMMIT=${GITHUB_SHA} \
+            --build-arg DATE=${DATE} \
+            --build-arg REPOSITORY=${GITHUB_REPOSITORY} \
+            ${BUILD_IMAGE_TAGS} ${OTHER_ARGS} ${OTHER_PUSH_ARGS} .
         fi
 
         if [[ "${GITHUB_ACTOR}" == "${GITHUB_REPOSITORY%/*}" ]]; then

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.18
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:

Dockerfile

@@ -1,14 +1,9 @@
 # syntax = docker/dockerfile:experimental
-FROM --platform=$BUILDPLATFORM golang:1.15-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.18-alpine as builder
 LABEL maintainer="Antonio Mika <[email protected]>"
 
 ENV CGO_ENABLED 0
 
-ARG VERSION=dev
-ARG COMMIT=none
-ARG DATE=unknown
-ARG REPOSITORY=unknown
-
 WORKDIR /app
 
 RUN --mount=type=bind,target=/cache,from=antoniomika/pcompose-build-cache \
@@ -28,6 +23,11 @@ COPY --from=builder /root/.cache/go-build /go-build
 
 FROM builder as build-image
 
+ARG VERSION=dev
+ARG COMMIT=none
+ARG DATE=unknown
+ARG REPOSITORY=unknown
+
 ARG TARGETOS
 ARG TARGETARCH
 

cmd/pcompose.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path"
 	"strings"
+	"time"
 
 	"github.com/antoniomika/pcompose/hook"
 	"github.com/antoniomika/pcompose/sshserver"
@@ -57,8 +58,8 @@ func init() {
 	rootCmd.PersistentFlags().StringP("whitelisted-ips", "w", "", "A comma separated list of whitelisted ips. Applies to SSH connections")
 	rootCmd.PersistentFlags().StringP("whitelisted-countries", "y", "", "A comma separated list of whitelisted countries. Applies to SSH connections")
 	rootCmd.PersistentFlags().StringP("private-key-passphrase", "p", "S3Cr3tP4$$phrAsE", "Passphrase to use to encrypt the server private key")
-	rootCmd.PersistentFlags().StringP("private-key-location", "l", "deploy/keys/ssh_key", "The location of the SSH server private key. pcompose will create a private key here if\nit doesn't exist using the --private-key-passphrase to encrypt it if supplied")
-	rootCmd.PersistentFlags().StringP("authentication-password", "u", "S3Cr3tP4$$W0rD", "Password to use for ssh server password authentication")
+	rootCmd.PersistentFlags().StringP("private-keys-directory", "l", "deploy/keys", "The location of other SSH server private keys. sish will add these as valid auth methods for SSH. Note, these need to be unencrypted OR use the private-key-passphrase")
+	rootCmd.PersistentFlags().StringP("authentication-password", "u", "", "Password to use for ssh server password authentication")
 	rootCmd.PersistentFlags().StringP("authentication-keys-directory", "k", "deploy/pubkeys/", "Directory where public keys for public key authentication are stored.\npcompose will watch this directory and automatically load new keys and remove keys\nfrom the authentication list")
 	rootCmd.PersistentFlags().StringP("time-format", "", "2006/01/02 - 15:04:05", "The time format to use for general log messages")
 	rootCmd.PersistentFlags().StringP("log-to-file-path", "", "/tmp/pcompose.log", "The file to write log output to")
@@ -77,6 +78,8 @@ func init() {
 	rootCmd.PersistentFlags().IntP("log-to-file-max-size", "", 500, "The maximum size of outputed log files in megabytes")
 	rootCmd.PersistentFlags().IntP("log-to-file-max-backups", "", 3, "The maxium number of rotated logs files to keep")
 	rootCmd.PersistentFlags().IntP("log-to-file-max-age", "", 28, "The maxium number of days to store log output in a file")
+
+	rootCmd.PersistentFlags().DurationP("authentication-keys-directory-watch-interval", "", 200*time.Millisecond, "The interval to poll for filesystem changes for SSH keys")
 }
 
 // initConfig initializes the configuration and loads needed

go.mod

@@ -1,18 +1,74 @@
 module github.com/antoniomika/pcompose
 
-go 1.15
+go 1.18
 
 require (
-	github.com/antoniomika/sish v1.1.5
-	github.com/creack/pty v1.1.11
-	github.com/fsnotify/fsnotify v1.4.9
-	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/cobra v1.1.3
-	github.com/spf13/viper v1.7.1
-	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
+	github.com/antoniomika/sish v1.1.8-0.20220629213805-9ad6cdc6b02a
+	github.com/creack/pty v1.1.18
+	github.com/fsnotify/fsnotify v1.5.4
+	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/cobra v1.5.0
+	github.com/spf13/viper v1.12.0
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )
 
-replace github.com/pires/go-proxyproto => github.com/antoniomika/go-proxyproto v0.1.4-0.20210215223815-7210fcdac442
+require (
+	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
+	github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5 // indirect
+	github.com/antoniomika/syncmap v1.0.0 // indirect
+	github.com/caddyserver/certmagic v0.16.1 // indirect
+	github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gin-gonic/gin v1.8.1 // indirect
+	github.com/go-playground/locales v0.14.0 // indirect
+	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-playground/validator/v10 v10.11.0 // indirect
+	github.com/goccy/go-json v0.9.8 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jpillora/ipfilter v1.2.6 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/libdns/libdns v0.2.1 // indirect
+	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mailgun/timetools v0.0.0-20170619190023-f3a7b8ffff47 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mholt/acmez v1.0.3 // indirect
+	github.com/miekg/dns v1.1.50 // indirect
+	github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
+	github.com/phuslu/iploc v1.0.20220630 // indirect
+	github.com/pires/go-proxyproto v0.6.2 // indirect
+	github.com/radovskyb/watcher v1.0.7 // indirect
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.4.0 // indirect
+	github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect
+	github.com/ugorji/go/codec v1.2.7 // indirect
+	github.com/vulcand/oxy v1.4.1 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
+	golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.11 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/ini.v1 v1.66.6 // indirect
+	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
 
 replace github.com/vulcand/oxy => github.com/antoniomika/oxy v1.1.1-0.20210215225031-0afb828604bb