Skip to content

Commit

Permalink
Merge pull request #3 from Inpher/golgeek/bump
Browse files Browse the repository at this point in the history 
Bump dependencies, Debian and go version
  • Loading branch information
@golgeek
golgeek authored Feb 1, 2024
2 parents f04ab08 + 7a2be8b commit a3c65bc
Show file tree
Hide file tree
Showing 3,701 changed files with 266 additions and 4,926,866 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.21'
cache: false
- uses: actions/checkout@v3
- name: golangci-lint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.21
- name: Run tests
run: go test ./...

Expand All @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.21
- name: Run gocyclo
run: go generate ./...

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.21
- name: Run tests
run: go test ./...

Expand All @@ -23,7 +23,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.21
- name: Run gocyclo
run: go generate ./...

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.21
- name: Import GPG key
id: import_gpg
uses: paultyng/ghaction-import-gpg@v2.1.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/scp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func init() {
This requires the execution of script in complement of your usual scp command.
To get this running, execute the following commands:
%s scp --get-script > ~/.%sscp && chmod +x ~/.%sscp
alias %sscp='scp -S ~/.%sscp '
alias %sscp='scp -O -S ~/.%sscp '
And voila, you're all set: just run the command '%sscp' as you would run 'scp'!`,
config.GetSBName(), config.GetSBName(), config.GetSBName(), config.GetSBName(), config.GetSBName(), config.GetSBName()),
}, map[string]commands.Argument{
Expand Down
3 changes: 3 additions & 0 deletions cmd/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ func (c *Setup) _SetSSHDOptions() (err error) {
log.Printf("[SETUP ] -> Switch %-32s to yes", "ChallengeResponseAuthentication")
p.SetParam("ChallengeResponseAuthentication", "yes")

log.Printf("[SETUP ] -> Switch %-32s to yes", "KbdInteractiveAuthentication")
p.SetParam("KbdInteractiveAuthentication", "yes")

log.Printf("[SETUP ] -> Switch %-32s to yes", "PasswordAuthentication")
p.SetParam("PasswordAuthentication", "no")

Expand Down
6 changes: 3 additions & 3 deletions demo/Dockerfiles/example-vm/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM debian:bullseye
FROM debian:bookworm

# Install base required packages
RUN apt-get update && apt-get -yy install openssh-server

RUN mkdir /run/sshd
RUN mkdir /root/.ssh
RUN mkdir -p /run/sshd
RUN mkdir -p /root/.ssh

CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
4 changes: 2 additions & 2 deletions demo/Dockerfiles/sb/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM golang:1.18-bullseye as builder
FROM golang:1.21-bookworm as builder
WORKDIR /app
ADD . /app
RUN go build -o sb

FROM debian:bullseye
FROM debian:bookworm

# Install base required packages
RUN apt-get update && apt-get -yy install curl gnupg openssh-server libpam-google-authenticator sudo supervisor
Expand Down
130 changes: 75 additions & 55 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,122 @@
module github.com/inpher/sb

go 1.18
go 1.21

require (
cloud.google.com/go/pubsub v1.29.0
cloud.google.com/go/storage v1.30.0
cloud.google.com/go/pubsub v1.36.1
cloud.google.com/go/storage v1.37.0
github.com/ReneKroon/ttlcache v1.7.0
github.com/aws/aws-sdk-go v1.44.225
github.com/aws/aws-sdk-go v1.50.9
github.com/c-bata/go-prompt v0.2.6
github.com/fatih/color v1.15.0
github.com/fatih/color v1.16.0
github.com/fzipp/gocyclo v0.6.0
github.com/glebarez/sqlite v1.7.0
github.com/glebarez/sqlite v1.10.0
github.com/golgeek/ttyrec2gif v0.0.0-20220613232656-6c32732836a3
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/mdp/qrterminal/v3 v3.0.0
github.com/mholt/archiver/v4 v4.0.0-alpha.7
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/mdp/qrterminal/v3 v3.2.0
github.com/mholt/archiver/v4 v4.0.0-alpha.8
github.com/pkg/errors v0.9.1
github.com/pquerna/otp v1.4.0
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.1
golang.org/x/crypto v0.7.0
golang.org/x/term v0.6.0
google.golang.org/api v0.114.0
gorm.io/gorm v1.24.6
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.8.4
golang.org/x/crypto v0.18.0
golang.org/x/term v0.16.0
google.golang.org/api v0.161.0
gorm.io/gorm v1.25.6
maze.io/x/ttyrec v1.0.0
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute v1.23.4 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/bodgit/plumbing v1.3.0 // indirect
github.com/bodgit/sevenzip v1.4.5 // indirect
github.com/bodgit/windows v1.0.1 // indirect
github.com/boombuler/barcode v1.0.1 // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/creack/pty v1.1.21 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/errnoh/term.color v0.0.0-20130702201447-e95d97fdbdec // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/glebarez/go-sqlite v1.21.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/glebarez/go-sqlite v1.22.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/james4k/terminal v0.0.0-20140729193110-b4bcb6ee7c08 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.16.3 // indirect
github.com/klauspost/pgzip v1.2.5 // indirect
github.com/klauspost/compress v1.17.5 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/kr/pty v1.1.8 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-tty v0.0.4 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-tty v0.0.5 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pkg/term v1.2.0-beta.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/rivo/uniseg v0.4.6 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/sugyan/ttyread v0.0.0-20140728103301-67501e8d8a3b // indirect
github.com/therootcompany/xz v1.0.1 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/image v0.6.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/otel v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
golang.org/x/image v0.15.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.22.3 // indirect
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.5.0 // indirect
modernc.org/sqlite v1.21.0 // indirect
modernc.org/libc v1.40.10 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.2 // indirect
modernc.org/sqlite v1.28.0 // indirect
rsc.io/qr v0.2.0 // indirect
)
Loading

0 comments on commit a3c65bc

Please sign in to comment.