Skip to content

Commit 2d52339

Browse files
authored
Merge pull request #682 from tidepool-org/BACK-2679/resolve-dependabot-issues.4
[BACK-2679] Resolve dependabot issues
2 parents 2acbff8 + 47a7cdc commit 2d52339

File tree

115 files changed

+3455
-1136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+3455
-1136
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ _tmp/
44
coverprofile.out
55
debug
66
deploy/
7+
*.test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.coverprofile
22
*.env
33
*.test
4+
coverprofile.out
45
/_bin
56
/_data
67
/_log

.travis.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
sudo: false
2-
31
dist: jammy
42

53
language: go
64

75
go:
8-
- 1.21.x
6+
- 1.22.2
97

10-
go_import_path: github.com/tidepool-org/platform
8+
services:
9+
- docker
1110

1211
env:
1312
global:
14-
- MONGODB=6.0.11
15-
- MONGOSH=2.0.2
16-
- DIST=jammy
13+
- MONGODB=6.0.14
14+
- MONGOSH=2.2.3
15+
16+
cache:
17+
directories:
18+
- $HOME/.cache/go-build
1719

1820
before_install:
1921
- sudo apt update
2022
- sudo apt install -y docker-buildx mongodb-org=${MONGODB} mongodb-org-database=${MONGODB} mongodb-org-server=${MONGODB} mongodb-mongosh=${MONGOSH} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB}
2123
- mkdir /tmp/data
22-
- /usr/bin/mongod --replSet rs0 --dbpath /tmp/data --bind_ip 127.0.0.1 --logpath ${PWD}/mongod.log &> /dev/null &
24+
- /usr/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 --replSet rs0 --logpath ${PWD}/mongod.log &> /dev/null &
2325
- until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done
24-
- /usr/bin/mongosh --host 127.0.0.1 --port 27017 --eval 'rs.initiate(); while (rs.status().startupStatus || (rs.status().hasOwnProperty("myState") && rs.status().myState != 1)) { printjson( rs.status() ); sleep(1000); }; printjson( rs.status() );'
26+
- /usr/bin/mongosh --eval 'rs.initiate(); while (rs.status().startupStatus || (rs.status().hasOwnProperty("myState") && rs.status().myState != 1)) { printjson( rs.status() ); sleep(1000); }; printjson( rs.status() );'
2527

2628
addons:
2729
apt:
2830
sources:
29-
- sourceline: 'deb https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse'
30-
key_url: 'https://pgp.mongodb.com/server-6.0.asc'
31+
- sourceline: 'deb https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse'
32+
key_url: 'https://pgp.mongodb.com/server-7.0.asc'
3133
artifacts:
3234
s3_region: us-west-2
3335
paths:
@@ -37,12 +39,5 @@ addons:
3739
code_climate:
3840
repo_token: 91ded9b66924acbe830541ab3593daf535f05f7c6db91b5cbd2d26dcf37da0b8
3941

40-
services:
41-
- docker
42-
4342
script:
4443
- make ci-generate ci-build ci-test ci-deploy ci-docker
45-
46-
cache:
47-
directories:
48-
- $HOME/.cache/go-build

Dockerfile.auth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development
2-
FROM golang:1.21-alpine AS development
2+
FROM golang:1.22.2-alpine AS development
33
WORKDIR /go/src/github.com/tidepool-org/platform
44
RUN apk --no-cache update && \
55
apk --no-cache upgrade && \

Dockerfile.blob

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development
2-
FROM golang:1.21-alpine AS development
2+
FROM golang:1.22.2-alpine AS development
33
WORKDIR /go/src/github.com/tidepool-org/platform
44
RUN apk --no-cache update && \
55
apk --no-cache upgrade && \

Dockerfile.data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development
2-
FROM golang:1.21-alpine AS development
2+
FROM golang:1.22.2-alpine AS development
33
WORKDIR /go/src/github.com/tidepool-org/platform
44
RUN apk --no-cache update && \
55
apk --no-cache upgrade && \

Dockerfile.migrations

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development
2-
FROM golang:1.21-alpine AS development
2+
FROM golang:1.22.2-alpine AS development
33
WORKDIR /go/src/github.com/tidepool-org/platform
44
RUN apk --no-cache update && \
55
apk --no-cache upgrade && \

Dockerfile.prescription

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development
2-
FROM golang:1.21-alpine AS development
2+
FROM golang:1.22.2-alpine AS development
33
WORKDIR /go/src/github.com/tidepool-org/platform
44
RUN apk --no-cache update && \
55
apk --no-cache upgrade && \

Dockerfile.task

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development
2-
FROM golang:1.21-alpine AS development
2+
FROM golang:1.22.2-alpine AS development
33
WORKDIR /go/src/github.com/tidepool-org/platform
44
RUN apk --no-cache update && \
55
apk --no-cache upgrade && \

Dockerfile.tools

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development
2-
FROM golang:1.21-alpine AS development
2+
FROM golang:1.22.2-alpine AS development
33
WORKDIR /go/src/github.com/tidepool-org/platform
44
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.9/community' >> /etc/apk/repositories && \
55
echo 'http://dl-cdn.alpinelinux.org/alpine/v3.9/main' >> /etc/apk/repositories && \
@@ -14,7 +14,7 @@ RUN ["make", "service-build"]
1414
CMD ["make", "service-start"]
1515

1616
# Production
17-
FROM mongo:6.0.8 AS production
17+
FROM mongo:6.0.14 AS production
1818
# this statically set $HOME is non-ideal, but is to combat it being hardcoded to /data/db upstream
1919
ENV HOME="/home/tidepool/" DEBIAN_FRONTEND="noninteractive"
2020
RUN apt -y update && \

0 commit comments

Comments
 (0)