Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Parwinder/bcda 8306 dependency updates #995

Closed
wants to merge 6 commits into from
Closed

Parwinder/bcda 8306 dependency updates #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2bd301
update dependencies for open CVEs
bhagatparwinder Sep 23, 2024
6c86b88
Merge branch 'main' into parwinder/BCDA-8306-dependency-updates
bhagatparwinder Oct 1, 2024
976ed66
tidying it up
bhagatparwinder Oct 1, 2024
601982d
update Go docker image
bhagatparwinder Oct 1, 2024
81d57e8
update GO docker images
bhagatparwinder Oct 1, 2024
f08e467
Go work update
bhagatparwinder Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfiles/Dockerfile.bcda_prod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1-experimental
FROM golang:1.21-alpine3.20 AS builder
FROM golang:1.23.1-alpine3.20 AS builder

RUN apk update upgrade

Expand All @@ -11,17 +11,17 @@ WORKDIR /go/src/github.com/CMSgov/bcda-app
COPY go.mod go.sum tools.go ./
RUN --mount=type=cache,target=/go/pkg/mod \
go mod download
RUN --mount=type=cache,target=/go/pkg/mod \
cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get %
RUN --mount=type=cache,target=/go/pkg/mod \
cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get %

COPY . .
WORKDIR /go/src/github.com/CMSgov/bcda-app/bcda
RUN --mount=type=cache,target=/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
go install -v
go install -v

# syntax = docker/dockerfile:1-experimental
FROM golang:1.21-alpine3.20
FROM golang:1.23.1-alpine3.20
ARG ENVIRONMENT
# only add dev packages if the environment argument was set to development
RUN [ "$ENVIRONMENT" != "development" ] || apk add git openssl entr bash
Expand Down
8 changes: 4 additions & 4 deletions Dockerfiles/Dockerfile.bcdaworker_prod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1-experimental
FROM golang:1.21-alpine3.20 AS builder
FROM golang:1.23.1-alpine3.20 AS builder

RUN apk update upgrade

Expand All @@ -11,8 +11,8 @@ WORKDIR /go/src/github.com/CMSgov/bcda-app
COPY go.mod go.sum tools.go ./
RUN --mount=type=cache,target=/go/pkg/mod \
go mod download
RUN --mount=type=cache,target=/go/pkg/mod \
cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get %
RUN --mount=type=cache,target=/go/pkg/mod \
cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get %

COPY . .
WORKDIR /go/src/github.com/CMSgov/bcda-app/bcdaworker
Expand All @@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
go install -v

# syntax = docker/dockerfile:1-experimental
FROM golang:1.21-alpine3.20
FROM golang:1.23.1-alpine3.20
ARG ENVIRONMENT
# only add dev packages if the environment argument was set to development
RUN [ "$ENVIRONMENT" != "development" ] || apk add git openssl entr bash
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/Dockerfile.documentation
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-alpine3.20
FROM golang:1.23.1-alpine3.20

ARG swaggerVersion=3.38.0
# Ensure swaggerVersion is available in the CMD
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/Dockerfile.package
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-alpine3.20
FROM golang:1.23.1-alpine3.20

ENV CGO_ENABLED=0

Expand Down
8 changes: 4 additions & 4 deletions Dockerfiles/Dockerfile.ssas
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1-experimental
FROM golang:1.21-alpine3.20 AS base
FROM golang:1.23.1-alpine3.20 AS base

RUN apk update upgrade
RUN apk add git
Expand All @@ -10,8 +10,8 @@ WORKDIR /go/src/github.com/CMSgov/bcda-app
# By pulling this step out, we can leverage Docker caching
# since our tooling/dependencies do not frequently change.
COPY go.mod go.sum tools.go ./
RUN --mount=type=cache,target=/go/pkg/mod \
cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get %
RUN --mount=type=cache,target=/go/pkg/mod \
cat tools.go | awk '/[\/\/] bcda/{flag=1; next} /[\/\/] end/{flag=0} flag' | awk -F '"' '{print $2}' | xargs -tI % go get %

COPY . .
WORKDIR /go
Expand All @@ -26,7 +26,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
go install -v ./ssas/service/main

FROM golang:1.21-alpine3.20 AS prod
FROM golang:1.23.1-alpine3.20 AS prod

RUN apk update upgrade
RUN apk add openssl
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/Dockerfile.tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1-experimental
FROM golang:1.19-alpine3.18
FROM golang:1.23.1-alpine3.20

RUN apk update upgrade

Expand Down
45 changes: 26 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/CMSgov/bcda-app

go 1.19
go 1.22

toolchain go1.23.0

require (
github.com/BurntSushi/toml v0.4.1
Expand All @@ -20,11 +22,10 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/fhir/go v0.0.0-20220518004845-30f5cde7c5cd
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.6.8
github.com/hashicorp/go-retryablehttp v0.7.7
github.com/howeyc/fsnotify v0.9.0
github.com/huandu/go-sqlbuilder v1.14.1
github.com/jackc/pgx v3.6.2+incompatible
github.com/mattn/go-colorable v0.1.12
github.com/mattn/go-colorable v0.1.13
github.com/mitchellh/mapstructure v1.5.0
github.com/newrelic/go-agent/v3 v3.18.1
github.com/newrelic/go-agent/v3/integrations/nrlogrus v1.0.0
Expand All @@ -35,15 +36,18 @@ require (
github.com/sirupsen/logrus v1.9.0
github.com/soheilhy/cmux v0.1.5
github.com/spf13/viper v1.9.0
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.9.0
github.com/tsenart/vegeta v12.7.0+incompatible
github.com/urfave/cli v1.22.9
golang.org/x/crypto v0.21.0
golang.org/x/text v0.14.0
golang.org/x/crypto v0.27.0
golang.org/x/text v0.18.0
gotest.tools/gotestsum v1.6.2
)

require github.com/CMSgov/bcda-app/optout v0.0.0-20231214212912-50fa0a1c3c8a
require (
github.com/CMSgov/bcda-app/optout v0.0.0-20231214212912-50fa0a1c3c8a
github.com/jackc/pgx v3.6.2+incompatible
)

require (
bitbucket.org/creachadair/stringset v0.0.10 // indirect
Expand All @@ -55,9 +59,10 @@ require (
github.com/denisenkom/go-mssqldb v0.9.0 // indirect
github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 // indirect
github.com/dgryski/go-lttb v0.0.0-20180810165845-318fcdf10a77 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/dnephin/pflag v1.0.7 // indirect
github.com/docker/docker v24.0.9+incompatible // indirect
github.com/fatih/color v1.10.0 // indirect
github.com/docker/docker v25.0.6+incompatible // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
Expand All @@ -76,7 +81,7 @@ require (
github.com/lib/pq v1.10.6 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -92,20 +97,22 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/tools v0.6.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.56.3 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading
Loading