Skip to content

Commit

Permalink
bumped to go 1.17 & release to quay.io
Browse files Browse the repository at this point in the history
  • Loading branch information
mvisonneau committed Feb 11, 2022
1 parent 53cebd7 commit 929bbac
Show file tree
Hide file tree
Showing 10 changed files with 345 additions and 200 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,26 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Docker Login
- name: docker.io Login
uses: docker/login-action@v1
with:
registry: docker.io
username: ${{ github.repository_owner }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}

- name: ghcr.io login
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GH_PAT }}

- name: Docker Login
- name: quay.io Login
uses: docker/login-action@v1
with:
registry: docker.io
registry: quay.io
username: ${{ github.repository_owner }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
password: ${{ secrets.QUAY_TOKEN }}

- name: Snapcraft config
uses: samuelmeuli/action-snapcraft@v1
Expand All @@ -49,7 +56,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@v3
Expand All @@ -60,7 +67,7 @@ jobs:
- name: Install goreleaser
uses: goreleaser/goreleaser-action@v2
with:
version: v0.166.1
version: v1.4.1
install-only: true

- name: Run goreleaser
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@ jobs:
test:
strategy:
matrix:
go-version:
- 1.16
os:
- ubuntu-20.04
- macos-10.15
- macos-11.0
- windows-2019
- windows-2022

runs-on: ${{ matrix.os }}

Expand All @@ -32,18 +29,18 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go-version }}
go-version: 1.17

- name: Lint
if: ${{ matrix.os == 'ubuntu-20.04' && matrix.go-version == '1.16' }}
if: ${{ matrix.os == 'ubuntu-20.04' }}
run: make lint

- name: Test
run: make coverage

- name: Publish coverage to coveralls.io
uses: shogo82148/actions-goveralls@v1
if: ${{ matrix.os == 'ubuntu-20.04' && matrix.go-version == '1.16' }}
if: ${{ matrix.os == 'ubuntu-20.04' }}
with:
path-to-profile: coverage.out

Expand Down
17 changes: 12 additions & 5 deletions .goreleaser.pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dockers:
- image_templates:
- 'docker.io/mvisonneau/strongbox:latest-amd64'
- 'ghcr.io/mvisonneau/strongbox:latest-amd64'
- 'quay.io/mvisonneau/strongbox:latest-amd64'
ids: [strongbox]
goarch: amd64
use_buildx: true
Expand All @@ -58,13 +59,14 @@ dockers:
- --label=org.opencontainers.image.licenses=Apache-2.0

- image_templates:
- 'docker.io/mvisonneau/strongbox:latest-arm64v8'
- 'ghcr.io/mvisonneau/strongbox:latest-arm64v8'
- 'docker.io/mvisonneau/strongbox:latest-arm64'
- 'ghcr.io/mvisonneau/strongbox:latest-arm64'
- 'quay.io/mvisonneau/strongbox:latest-arm64'
ids: [strongbox]
goarch: arm64
use_buildx: true
build_flag_templates:
- --platform=linux/arm64/v8
- --platform=linux/arm64
- --label=org.opencontainers.image.title={{ .ProjectName }}
- --label=org.opencontainers.image.description={{ .ProjectName }}
- --label=org.opencontainers.image.url=https://github.com/mvisonneau/strongbox
Expand All @@ -78,12 +80,17 @@ docker_manifests:
- name_template: docker.io/mvisonneau/strongbox:latest
image_templates:
- docker.io/mvisonneau/strongbox:latest-amd64
- docker.io/mvisonneau/strongbox:latest-arm64v8
- docker.io/mvisonneau/strongbox:latest-arm64

- name_template: ghcr.io/mvisonneau/strongbox:latest
image_templates:
- ghcr.io/mvisonneau/strongbox:latest-amd64
- ghcr.io/mvisonneau/strongbox:latest-arm64v8
- ghcr.io/mvisonneau/strongbox:latest-arm64

- name_template: quay.io/mvisonneau/strongbox:latest
image_templates:
- quay.io/mvisonneau/strongbox:latest-amd64
- quay.io/mvisonneau/strongbox:latest-arm64

signs:
- artifacts: checksum
Expand Down
17 changes: 12 additions & 5 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ dockers:
- image_templates:
- 'docker.io/mvisonneau/strongbox:{{ .Tag }}-amd64'
- 'ghcr.io/mvisonneau/strongbox:{{ .Tag }}-amd64'
- 'quay.io/mvisonneau/strongbox:{{ .Tag }}-amd64'
ids: [strongbox]
goarch: amd64
use_buildx: true
Expand All @@ -82,13 +83,14 @@ dockers:
- --label=org.opencontainers.image.licenses=Apache-2.0

- image_templates:
- 'docker.io/mvisonneau/strongbox:{{ .Tag }}-arm64v8'
- 'ghcr.io/mvisonneau/strongbox:{{ .Tag }}-arm64v8'
- 'docker.io/mvisonneau/strongbox:{{ .Tag }}-arm64'
- 'ghcr.io/mvisonneau/strongbox:{{ .Tag }}-arm64'
- 'quay.io/mvisonneau/strongbox:{{ .Tag }}-arm64'
ids: [strongbox]
goarch: arm64
use_buildx: true
build_flag_templates:
- --platform=linux/arm64/v8
- --platform=linux/arm64
- --label=org.opencontainers.image.title={{ .ProjectName }}
- --label=org.opencontainers.image.description={{ .ProjectName }}
- --label=org.opencontainers.image.url=https://github.com/mvisonneau/strongbox
Expand All @@ -102,12 +104,17 @@ docker_manifests:
- name_template: docker.io/mvisonneau/strongbox:{{ .Tag }}
image_templates:
- docker.io/mvisonneau/strongbox:{{ .Tag }}-amd64
- docker.io/mvisonneau/strongbox:{{ .Tag }}-arm64v8
- docker.io/mvisonneau/strongbox:{{ .Tag }}-arm64

- name_template: ghcr.io/mvisonneau/strongbox:{{ .Tag }}
image_templates:
- ghcr.io/mvisonneau/strongbox:{{ .Tag }}-amd64
- ghcr.io/mvisonneau/strongbox:{{ .Tag }}-arm64v8
- ghcr.io/mvisonneau/strongbox:{{ .Tag }}-arm64

- name_template: quay.io/mvisonneau/strongbox:{{ .Tag }}
image_templates:
- quay.io/mvisonneau/strongbox:{{ .Tag }}-amd64
- quay.io/mvisonneau/strongbox:{{ .Tag }}-arm64

checksum:
name_template: '{{ .ProjectName }}_{{ .Tag }}_sha512sums.txt'
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ and this project adheres to [0ver](https://0ver.org).

## [Unreleased]

### Added

- Release container images to `quay.io`

### Changed

- Bumped go to `1.17`
- Bumped most dependencies

## [v0.2.1] - 2021-06-01

### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ apk add --no-cache ca-certificates
# RELEASE CONTAINER
##

FROM busybox:1.34.1-glibc
FROM busybox:1.35-glibc

WORKDIR /

Expand Down
14 changes: 5 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@ REPOSITORY := mvisonneau/$(NAME)
VAULT_VERSION := 1.7.2
.DEFAULT_GOAL := help

export GO111MODULE=on

.PHONY: setup
setup: ## Install required libraries/tools for build tasks
@command -v cover 2>&1 >/dev/null || GO111MODULE=off go get -u -v golang.org/x/tools/cmd/cover
@command -v gofumpt 2>&1 >/dev/null || GO111MODULE=off go get -u -v mvdan.cc/gofumpt
@command -v gosec 2>&1 >/dev/null || GO111MODULE=off go get -u -v github.com/securego/gosec/cmd/gosec
@command -v goveralls 2>&1 >/dev/null || GO111MODULE=off go get -u -v github.com/mattn/goveralls
@command -v ineffassign 2>&1 >/dev/null || GO111MODULE=off go get -u -v github.com/gordonklaus/ineffassign
@command -v misspell 2>&1 >/dev/null || GO111MODULE=off go get -u -v github.com/client9/misspell/cmd/misspell
@command -v revive 2>&1 >/dev/null || GO111MODULE=off go get -u -v github.com/mgechev/revive
@command -v gofumpt 2>&1 >/dev/null || go install mvdan.cc/gofumpt@v0.2.1
@command -v gosec 2>&1 >/dev/null || go install github.com/securego/gosec/v2/cmd/gosec@v2.9.6
@command -v ineffassign 2>&1 >/dev/null || go install github.com/gordonklaus/ineffassign@v0.0.0-20210914165742-4cc7213b9bc8
@command -v misspell 2>&1 >/dev/null || go install github.com/client9/misspell/cmd/misspell@v0.3.4
@command -v revive 2>&1 >/dev/null || go install github.com/mgechev/revive@v1.1.3

.PHONY: fmt
fmt: setup ## Format source code
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Have a look onto the [latest release page](https://github.com/mvisonneau/strongb

```bash
~$ docker run -it --rm docker.io/mvisonneau/strongbox
or
~$ docker run -it --rm ghcr.io/mvisonneau/strongbox
~$ docker run -it --rm quay.io/mvisonneau/strongbox
```

### Scoop
Expand Down
98 changes: 70 additions & 28 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,41 +1,83 @@
module github.com/mvisonneau/strongbox

go 1.15
go 1.17

require (
cloud.google.com/go v0.82.0 // indirect
github.com/aws/aws-sdk-go v1.38.51 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/fatih/color v1.12.0
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
github.com/hashicorp/vault/api v1.1.0
github.com/hashicorp/vault/sdk v0.2.0
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/fatih/color v1.13.0
github.com/hashicorp/vault/api v1.3.1
github.com/hashicorp/vault/sdk v0.3.0
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mvisonneau/go-helpers v0.0.1
github.com/mvisonneau/s5 v0.0.0-20200911102212-e0293447f0a8
github.com/olekukonko/tablewriter v0.0.5
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.7.0
github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8
github.com/urfave/cli/v2 v2.3.0
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
golang.org/x/sys v0.0.0-20210601080250-7ecdf8ef093b // indirect
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/api v0.47.0 // indirect
google.golang.org/genproto v0.0.0-20210524171403-669157292da3 // indirect
google.golang.org/grpc v1.38.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

require (
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go/compute v1.2.0 // indirect
cloud.google.com/go/iam v0.1.1 // indirect
cloud.google.com/go/kms v1.2.0 // indirect
github.com/armon/go-metrics v0.3.10 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.42.51 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.1.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.3 // indirect
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.2 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/hashicorp/go-version v1.4.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
github.com/jchavannes/go-pgp v0.0.0-20200131171414-e5978e6d02b4 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/api v0.68.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220210181026-6fee9acbd336 // indirect
google.golang.org/grpc v1.44.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
)
Loading

0 comments on commit 929bbac

Please sign in to comment.