Skip to content

Commit

Permalink
7.2.0 (#155)
Browse files Browse the repository at this point in the history 
- updates to cnquery 7.2.0
- updates docker build to use cnquery container image
- publishes docker to docker hub
  • Loading branch information
@chris-rock
chris-rock authored Oct 31, 2022
1 parent 5db3d56 commit babecff
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 86 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/goreleaser.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- '*'
workflow_dispatch:

env:
REGISTRY: docker.io

jobs:
goreleaser:
permissions:
Expand Down Expand Up @@ -54,8 +57,8 @@ jobs:
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v3
with:
Expand Down
32 changes: 16 additions & 16 deletions .goreleaser.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ dockers: # https://goreleaser.com/customization/docker/
goos: linux
goarch: amd64
image_templates:
- "ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-amd64"
- "ghcr.io/mondoohq/{{ .ProjectName }}:latest-amd64"
- "mondoo/{{ .ProjectName }}:{{ .Version }}-amd64"
- "mondoo/{{ .ProjectName }}:latest-amd64"
build_flag_templates:
- "--platform=linux/amd64"
- "--label=org.opencontainers.image.created={{.Date}}"
Expand All @@ -98,8 +98,8 @@ dockers: # https://goreleaser.com/customization/docker/
goos: linux
goarch: arm64
image_templates:
- "ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-arm64v8"
- "ghcr.io/mondoohq/{{ .ProjectName }}:latest-arm64v8"
- "mondoo/{{ .ProjectName }}:{{ .Version }}-arm64v8"
- "mondoo/{{ .ProjectName }}:latest-arm64v8"
build_flag_templates:
- "--platform=linux/arm64/v8"
- "--label=org.opencontainers.image.created={{.Date}}"
Expand All @@ -111,8 +111,8 @@ dockers: # https://goreleaser.com/customization/docker/
goarch: arm
goarm: 6
image_templates:
- "ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-armv6"
- "ghcr.io/mondoohq/{{ .ProjectName }}:latest-armv6"
- "mondoo/{{ .ProjectName }}:{{ .Version }}-armv6"
- "mondoo/{{ .ProjectName }}:latest-armv6"
build_flag_templates:
- "--platform=linux/arm/v6"
- "--label=org.opencontainers.image.created={{.Date}}"
Expand All @@ -124,8 +124,8 @@ dockers: # https://goreleaser.com/customization/docker/
goarch: arm
goarm: 7
image_templates:
- "ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-armv7"
- "ghcr.io/mondoohq/{{ .ProjectName }}:latest-armv7"
- "mondoo/{{ .ProjectName }}:{{ .Version }}-armv7"
- "mondoo/{{ .ProjectName }}:latest-armv7"
build_flag_templates:
- "--platform=linux/arm/v7"
- "--label=org.opencontainers.image.created={{.Date}}"
Expand All @@ -135,13 +135,13 @@ dockers: # https://goreleaser.com/customization/docker/
docker_manifests: # https://goreleaser.com/customization/docker_manifest/
- name_template: mondoo/{{ .ProjectName }}:{{ .Version }}
image_templates:
- ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-amd64
- ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-arm64v8
- ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-armv6
- ghcr.io/mondoohq/{{ .ProjectName }}:{{ .Version }}-armv7
- mondoo/{{ .ProjectName }}:{{ .Version }}-amd64
- mondoo/{{ .ProjectName }}:{{ .Version }}-arm64v8
- mondoo/{{ .ProjectName }}:{{ .Version }}-armv6
- mondoo/{{ .ProjectName }}:{{ .Version }}-armv7
- name_template: mondoo/{{ .ProjectName }}:latest
image_templates:
- ghcr.io/mondoohq/{{ .ProjectName }}:latest-amd64
- ghcr.io/mondoohq/{{ .ProjectName }}:latest-arm64v8
- ghcr.io/mondoohq/{{ .ProjectName }}:latest-armv6
- ghcr.io/mondoohq/{{ .ProjectName }}:latest-armv7
- mondoo/{{ .ProjectName }}:latest-amd64
- mondoo/{{ .ProjectName }}:latest-arm64v8
- mondoo/{{ .ProjectName }}:latest-armv6
- mondoo/{{ .ProjectName }}:latest-armv7
5 changes: 1 addition & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
FROM alpine:3.16
RUN apk update &&\
apk add ca-certificates wget tar &&\
rm -rf /var/cache/apk/*
FROM mondoo/cnquery:7.2.0
COPY cnspec /usr/local/bin
ENTRYPOINT ["cnspec"]
CMD ["help"]
48 changes: 24 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ require (
github.com/rs/zerolog v1.28.0
github.com/segmentio/fasthash v1.0.3
github.com/segmentio/ksuid v1.0.4
github.com/spf13/cobra v1.6.0
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c
github.com/spf13/viper v1.13.0
github.com/stretchr/testify v1.8.0
go.mondoo.com/cnquery v0.0.0-20221024153533-13a4a7b6a6cf
github.com/stretchr/testify v1.8.1
go.mondoo.com/cnquery v0.0.0-20221031224435-72f91fc1103c
go.mondoo.com/ranger-rpc v0.5.1-0.20220923135836-9e7732899d34
go.opentelemetry.io/otel v1.11.0
go.opentelemetry.io/otel v1.11.1
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc
google.golang.org/protobuf v1.28.1
Expand Down Expand Up @@ -83,13 +83,13 @@ require (
github.com/ashanbrown/makezero v1.1.1 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go v1.44.86 // indirect
github.com/aws/aws-sdk-go-v2 v1.16.16 // indirect
github.com/aws/aws-sdk-go-v2 v1.17.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.8 // indirect
github.com/aws/aws-sdk-go-v2/config v1.17.8 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.21 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.23 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.14 // indirect
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.16.0 // indirect
Expand Down Expand Up @@ -120,24 +120,24 @@ require (
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.9 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.19 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.19 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.18.11 // indirect
github.com/aws/aws-sdk-go-v2/service/lambda v1.24.6 // indirect
github.com/aws/aws-sdk-go-v2/service/organizations v1.16.13 // indirect
github.com/aws/aws-sdk-go-v2/service/rds v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/service/redshift v1.26.10 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect
github.com/aws/aws-sdk-go-v2/service/s3control v1.23.0 // indirect
github.com/aws/aws-sdk-go-v2/service/s3control v1.24.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.46.0 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.16.2 // indirect
github.com/aws/aws-sdk-go-v2/service/securityhub v1.23.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sns v1.18.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.30.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.23 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 // indirect
github.com/aws/smithy-go v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.31.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.25 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.17.1 // indirect
github.com/aws/smithy-go v1.13.4 // indirect
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bkielbasa/cyclop v1.2.0 // indirect
Expand Down Expand Up @@ -373,7 +373,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/sylvia7788/contextcheck v1.0.8 // indirect
github.com/tdakkota/asciicheck v0.1.1 // indirect
Expand All @@ -396,19 +396,19 @@ require (
github.com/zclconf/go-cty v1.11.0 // indirect
gitlab.com/bosi/decorder v0.2.3 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/otel/trace v1.11.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
Expand Down
Loading

0 comments on commit babecff

Please sign in to comment.