diff --git a/.circleci/config.yml b/.circleci/config.yml index 516c285f..8bb21796 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,11 @@ version: 2.1 orbs: - moul: moul/build@1.13.0 # https://github.com/moul/build + moul: moul/build@1.16.0 # https://github.com/moul/build retry: moul/retry@0.6.0 # https://github.com/moul/retry - codecov: codecov/codecov@1.0.5 - docker: circleci/docker@0.5.13 - gotools: gotest/tools@0.0.10 + codecov: codecov/codecov@1.2.5 + docker: circleci/docker@0.6.1 + gotools: gotest/tools@0.0.14 jobs: go-generate: diff --git a/Dockerfile b/Dockerfile index 64bb34ee..93370105 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine as builder +FROM golang:1.23-alpine as builder WORKDIR /go/src/ultre.me/calcbiz RUN apk --no-cache --update add npm make gcc g++ musl-dev openssl-dev git ENV GO111MODULE=on @@ -9,7 +9,7 @@ COPY . /go/src/ultre.me/calcbiz/ RUN make packr RUN make install -FROM alpine:3.13 +FROM alpine:3.20 RUN apk --no-cache --update add ca-certificates && update-ca-certificates COPY --from=builder /go/bin/calcbiz /bin/calcbiz #COPY ./static . diff --git a/go.mod b/go.mod index d3b8fb9a..61d229df 100644 --- a/go.mod +++ b/go.mod @@ -6,57 +6,57 @@ require ( github.com/Masterminds/sprig v2.22.0+incompatible github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/disintegration/imaging v1.6.2 - github.com/go-chi/chi v4.0.2+incompatible + github.com/go-chi/chi v4.1.3+incompatible github.com/gobuffalo/envy v1.8.1 // indirect - github.com/gobuffalo/packd v0.3.0 + github.com/gobuffalo/packd v0.4.0 github.com/gobuffalo/packr v1.30.1 github.com/gogo/gateway v1.1.0 github.com/gogo/protobuf v1.3.1 - github.com/golang/protobuf v1.3.2 + github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.1.1 // indirect github.com/googollee/go-engine.io v1.4.2 - github.com/googollee/go-socket.io v1.4.3-0.20191204093753-683f8725b6d0 + github.com/googollee/go-socket.io v1.7.0 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect - github.com/gorilla/mux v1.7.3 + github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket v1.4.1 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 - github.com/grpc-ecosystem/grpc-gateway v1.12.1 + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 + github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/huandu/xstrings v1.2.1 // indirect github.com/imdario/mergo v0.3.8 // indirect - github.com/jinzhu/gorm v1.9.11 + github.com/jinzhu/gorm v1.9.16 github.com/jtolds/gls v4.2.1+incompatible // indirect github.com/mattn/go-sqlite3 v2.0.1+incompatible // indirect github.com/mitchellh/copystructure v1.0.0 // indirect github.com/mitchellh/reflectwalk v1.0.1 // indirect github.com/moul/numberinfo v0.0.0-20160903151149-753f372df509 github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c - github.com/pkg/errors v0.8.1 + github.com/pkg/errors v0.9.1 github.com/rogpeppe/go-internal v1.5.0 // indirect - github.com/rs/cors v1.7.0 + github.com/rs/cors v1.11.1 github.com/shazow/memoizer v0.0.0-20130904030615-74fc48eaeadc github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect - github.com/tdewolff/minify/v2 v2.6.1 + github.com/tdewolff/minify/v2 v2.21.1 github.com/tdewolff/parse/v2 v2.4.1 // indirect - github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 + github.com/tmc/grpc-websocket-proxy 673ab2c3ae75 github.com/tpyolang/tpyo-cli v1.0.0 github.com/treastech/logger v0.0.0-20180705232552-e381e9ecf2e3 - github.com/urfave/cli v1.22.2 + github.com/urfave/cli v1.22.16 github.com/yanatan16/golang-soundcloud v0.0.0-20161013200625-a182dd459b66 go.uber.org/atomic v1.5.1 // indirect go.uber.org/multierr v1.4.0 // indirect - go.uber.org/zap v1.13.0 - golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 + go.uber.org/zap v1.27.0 + golang.org/x/crypto v0.29.0 golang.org/x/image v0.0.0-20191206065243-da761ea9ff43 // indirect golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect golang.org/x/net v0.0.0-20191207000613-e7e4b65ae663 // indirect golang.org/x/sys v0.0.0-20191206220618-eeba5f6aabab // indirect golang.org/x/text v0.3.2 // indirect golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd // indirect - google.golang.org/genproto v0.0.0-20191206224255-0243a4be9c8f + google.golang.org/genproto e639e219e697 google.golang.org/grpc v1.25.1 - moul.io/godev v1.3.0 - moul.io/srand v1.4.0 + moul.io/godev v1.7.0 + moul.io/srand v1.6.1 moul.io/zapgorm v0.0.0-20190706070406-8138918b527b ultre.me/kryptos v0.0.0-20181023194748-240fe1a16033 ultre.me/recettator v0.4.1-0.20190210231503-241df3a046a3 diff --git a/static/components/bootstrap/package.json b/static/components/bootstrap/package.json index 3243fa8b..b2c19471 100644 --- a/static/components/bootstrap/package.json +++ b/static/components/bootstrap/package.json @@ -30,37 +30,37 @@ "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" }, "devDependencies": { - "btoa": "~1.1.2", - "glob": "~4.0.2", + "btoa": "~1.2.0", + "glob": "~4.5.0", "grunt": "~0.4.5", - "grunt-autoprefixer": "~0.7.6", - "grunt-banner": "~0.2.3", - "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-concat": "~0.4.0", - "grunt-contrib-connect": "~0.8.0", - "grunt-contrib-copy": "~0.5.0", - "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-cssmin": "~0.10.0", - "grunt-contrib-jade": "~0.12.0", - "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-less": "~0.11.3", - "grunt-contrib-qunit": "~0.5.1", - "grunt-contrib-uglify": "~0.5.0", + "grunt-autoprefixer": "~0.8.0", + "grunt-banner": "~0.6.0", + "grunt-contrib-clean": "~0.7.0", + "grunt-contrib-concat": "~0.5.0", + "grunt-contrib-connect": "~0.11.0", + "grunt-contrib-copy": "~0.8.0", + "grunt-contrib-csslint": "~0.5.0", + "grunt-contrib-cssmin": "~0.14.0", + "grunt-contrib-jade": "~0.15.0", + "grunt-contrib-jshint": "~0.12.0", + "grunt-contrib-less": "~0.12.0", + "grunt-contrib-qunit": "~0.7.0", + "grunt-contrib-uglify": "~0.11.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~2.0.1", "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.18", "grunt-jekyll": "~0.4.2", - "grunt-jscs-checker": "~0.6.0", - "grunt-saucelabs": "~8.1.0", + "grunt-jscs-checker": "~0.8.0", + "grunt-saucelabs": "~8.6.0", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", "npm-shrinkwrap": "~3.1.6", - "time-grunt": "~0.3.2" + "time-grunt": "~0.4.0" }, "engines": { - "node": "~0.10.1" + "node": "~0.12.0" }, "jspm": { "main": "js/bootstrap", diff --git a/static/components/respond/package.json b/static/components/respond/package.json index 42864b01..d3e213e8 100644 --- a/static/components/respond/package.json +++ b/static/components/respond/package.json @@ -24,9 +24,9 @@ "devDependencies": { "grunt-cli":"~0.1", "grunt": "~0.4.0", - "grunt-contrib-jshint": "~0.2.0", - "grunt-contrib-qunit": "~0.3.0", - "grunt-contrib-uglify": "0.2.7" + "grunt-contrib-jshint": "~0.12.0", + "grunt-contrib-qunit": "~0.7.0", + "grunt-contrib-uglify": "0.11.1" } }