Skip to content

Commit

Permalink
chore: update go version
Browse files Browse the repository at this point in the history
Updating the default version to 1.16 and
adding 1.17 to supported. Dropping 1.15

Signed-off-by: crozzy <joseph.crosland@gmail.com>
  • Loading branch information
crozzy committed Sep 2, 2021
1 parent 28b78c5 commit f06b041
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
tidy:
name: Tidy
runs-on: ubuntu-latest
container: quay.io/projectquay/golang:1.15
container: quay.io/projectquay/golang:1.16
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:

strategy:
matrix:
go: ['1.15', '1.16']
go: ['1.16', '1.17']
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM quay.io/projectquay/golang:1.15 AS build
FROM quay.io/projectquay/golang:1.16 AS build
WORKDIR /build/
ADD . /build/
ARG CLAIR_VERSION=dev
Expand Down
11 changes: 6 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ services:

notifier:
container_name: clair-notifier
image: quay.io/projectquay/golang:1.15
image: quay.io/projectquay/golang:1.16
volumes:
- "./:/src/clair/"
environment:
Expand All @@ -93,7 +93,7 @@ services:
# this should only be created and deleted via the make target "local-dev-notifier-test"
notifier-test-mode:
container_name: clair-notifier
image: quay.io/projectquay/golang:1.15
image: quay.io/projectquay/golang:1.16
volumes:
- "./:/src/clair/"
environment:
Expand All @@ -112,7 +112,7 @@ services:

indexer:
container_name: clair-indexer
image: quay.io/projectquay/golang:1.15
image: quay.io/projectquay/golang:1.16
volumes:
- "./:/src/clair/"
environment:
Expand All @@ -134,7 +134,7 @@ services:
## allows layer fetching over localhost
indexer-quay:
container_name: clair-indexer
image: quay.io/projectquay/golang:1.15
image: quay.io/projectquay/golang:1.16
volumes:
- "./:/src/clair/"
environment:
Expand All @@ -152,10 +152,11 @@ services:
- "traefik.http.services.indexer.loadbalancer.server.port=6000"
depends_on:
- quay
- clair-db

matcher:
container_name: clair-matcher
image: quay.io/projectquay/golang:1.15
image: quay.io/projectquay/golang:1.16
volumes:
- "./:/src/clair/"
environment:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/quay/clair/v4

go 1.15
go 1.16

require (
github.com/docker/docker v1.13.1 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dp
github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-stomp/stomp v2.0.6+incompatible h1:4arQsMXdczrQtVOkhY7Rzt0AIDPs3yheg7vvmWEobSA=
Expand Down Expand Up @@ -1013,7 +1012,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
Expand Down

0 comments on commit f06b041

Please sign in to comment.