diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04af3c34..c6ace456 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - name: Check out source code uses: actions/checkout@v1 - run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH diff --git a/Dockerfile b/Dockerfile index 7e13c520..28146455 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN make build_ui ###################################### # Prepare go_builder ###################################### -FROM golang:1.16 as go_builder +FROM golang:1.17 as go_builder WORKDIR /go/src/github.com/openflagr/flagr ADD . . RUN make build @@ -23,7 +23,6 @@ FROM frolvlad/alpine-glibc:alpine-3.10 RUN apk add --no-cache curl WORKDIR /go/src/github.com/openflagr/flagr VOLUME ["/data"] - ENV HOST=0.0.0.0 ENV PORT=18000 ENV FLAGR_DB_DBDRIVER=sqlite3 diff --git a/docs/home.md b/docs/home.md index 373b5080..547edd4a 100644 --- a/docs/home.md +++ b/docs/home.md @@ -34,7 +34,7 @@ docker run -it -p 18000:18000 ghcr.io/openflagr/flagr Install Dependencies. -- Go (1.16+) +- Go (1.17+) - Make (for Makefile) - NPM (for building UI) diff --git a/go.mod b/go.mod index cb13a5da..715132d4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openflagr/flagr -go 1.16 +go 1.17 require ( cloud.google.com/go v0.37.4 @@ -55,3 +55,48 @@ require ( google.golang.org/grpc v1.19.0 gopkg.in/DataDog/dd-trace-go.v1 v1.9.0 ) + +require ( + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect + github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/eapache/go-resiliency v1.1.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/queue v1.1.0 // indirect + github.com/go-openapi/analysis v0.19.16 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-sql-driver/mysql v1.5.0 // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/golang/protobuf v1.2.0 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/google/go-cmp v0.5.2 // indirect + github.com/googleapis/gax-go/v2 v2.0.4 // indirect + github.com/hashicorp/golang-lru v0.5.0 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect + github.com/lib/pq v1.1.1 // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/pierrec/lz4 v2.0.5+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/common v0.2.0 // indirect + github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect + go.mongodb.org/mongo-driver v1.4.5 // indirect + go.opencensus.io v0.20.1 // indirect + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 // indirect + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect + golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect + golang.org/x/text v0.3.5 // indirect + google.golang.org/appengine v1.4.0 // indirect + google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect +) diff --git a/integration_tests/Dockerfile-Integration-Test b/integration_tests/Dockerfile-Integration-Test index 7813582e..a5669773 100644 --- a/integration_tests/Dockerfile-Integration-Test +++ b/integration_tests/Dockerfile-Integration-Test @@ -1,7 +1,7 @@ ###################################### # Prepare go_builder ###################################### -FROM golang:1.16 as go_builder +FROM golang:1.17 as go_builder WORKDIR /go/src/github.com/openflagr/flagr ADD . . RUN make build