Skip to content

Commit 20e8c24

Browse files
btassonebt353
and
bt353
authored
Added missing items to docker.local (#79)
* Added missing items to deco * Add "contents: read" & "pull-requests: write" to test.yaml * Fully update go.mod and go.sum to take care of security concerns --------- Co-authored-by: bt353 <[email protected]>
1 parent 9feb181 commit 20e8c24

File tree

4 files changed

+74
-56
lines changed

4 files changed

+74
-56
lines changed

.github/workflows/test.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Tests
2+
permissions:
3+
contents: read
4+
pull-requests: write
25
on:
36
push:
47

docker/Dockerfile.local

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21.3-alpine as gobuff
1+
FROM golang:1.21.3-alpine AS gobuff
22

33
EXPOSE 3000
44

@@ -23,7 +23,7 @@ RUN go install github.com/gobuffalo/buffalo-pop/v3@latest
2323
RUN mkdir /src
2424
WORKDIR /src
2525

26-
FROM gobuff as builder
26+
FROM gobuff AS builder
2727
RUN mkdir /app
2828
WORKDIR /app
2929
COPY go.mod .
@@ -34,11 +34,12 @@ RUN go version
3434
RUN buffalo build --static -o /bin/api
3535

3636
FROM alpine
37-
RUN apk add --no-cache bash ca-certificates
38-
37+
RUN apk add --no-cache bash ca-certificates curl
38+
3939
WORKDIR /app/
4040

41-
COPY --from=builder /bin/api ./api
41+
COPY --from=builder /bin/api /bin/api
42+
RUN chown nobody:nogroup /bin/api
4243

4344
# copy local config.json file
4445
COPY config/config.json ./config/
@@ -51,4 +52,5 @@ EXPOSE 8080
5152
RUN chown -R nobody:nogroup .
5253
USER nobody
5354

54-
CMD exec /app/api
55+
CMD cp /bin/api /app/api && \
56+
exec /app/api

go.mod

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,44 @@
11
module github.com/YaleSpinup/rds-api
22

3-
go 1.21
3+
go 1.23
4+
5+
toolchain go1.23.2
46

57
require (
68
github.com/YaleSpinup/apierror v0.1.5
7-
github.com/aws/aws-sdk-go v1.50.11
9+
github.com/aws/aws-sdk-go v1.55.5
810
github.com/gobuffalo/buffalo v1.1.0
911
github.com/gobuffalo/envy v1.10.2
1012
github.com/gobuffalo/mw-paramlogger v1.0.2
1113
github.com/gobuffalo/packr/v2 v2.8.3
1214
github.com/gobuffalo/suite/v3 v3.0.2
1315
github.com/gobuffalo/x v0.1.0
1416
github.com/pkg/errors v0.9.1
15-
github.com/rs/cors v1.11.0
17+
github.com/rs/cors v1.11.1
1618
github.com/sirupsen/logrus v1.9.3
1719
golang.org/x/crypto v0.31.0
1820
)
1921

2022
require (
2123
github.com/kr/pretty v0.3.1 // indirect
22-
golang.org/x/mod v0.17.0 // indirect
24+
golang.org/x/mod v0.22.0 // indirect
2325
)
2426

2527
require (
26-
github.com/BurntSushi/toml v1.3.2 // indirect
28+
github.com/BurntSushi/toml v1.4.0 // indirect
2729
github.com/Masterminds/semver/v3 v3.2.1 // indirect
2830
github.com/YaleSpinup/aws-go v0.2.5
2931
github.com/aymerick/douceur v0.2.0 // indirect
3032
github.com/davecgh/go-spew v1.1.1 // indirect
3133
github.com/dustin/go-humanize v1.0.1 // indirect
32-
github.com/fatih/color v1.15.0 // indirect
34+
github.com/fatih/color v1.18.0 // indirect
3335
github.com/fatih/structs v1.1.0 // indirect
34-
github.com/felixge/httpsnoop v1.0.3 // indirect
35-
github.com/fsnotify/fsnotify v1.6.0 // indirect
36+
github.com/felixge/httpsnoop v1.0.4 // indirect
37+
github.com/fsnotify/fsnotify v1.8.0 // indirect
3638
github.com/go-sql-driver/mysql v1.7.1 // indirect
3739
github.com/gobuffalo/events v1.4.3 // indirect
3840
github.com/gobuffalo/fizz v1.14.4 // indirect
39-
github.com/gobuffalo/flect v1.0.0 // indirect
41+
github.com/gobuffalo/flect v1.0.3 // indirect
4042
github.com/gobuffalo/github_flavored_markdown v1.1.4 // indirect
4143
github.com/gobuffalo/grift v1.5.2 // indirect
4244
github.com/gobuffalo/helpers v0.6.7 // indirect
@@ -46,19 +48,19 @@ require (
4648
github.com/gobuffalo/mw-csrf v1.0.2 // indirect
4749
github.com/gobuffalo/nulls v0.4.2 // indirect
4850
github.com/gobuffalo/packd v1.0.2 // indirect
49-
github.com/gobuffalo/plush/v4 v4.1.19 // indirect
51+
github.com/gobuffalo/plush/v4 v4.1.22 // indirect
5052
github.com/gobuffalo/pop/v5 v5.3.4 // indirect
5153
github.com/gobuffalo/refresh v1.13.3 // indirect
5254
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
5355
github.com/gobuffalo/validate/v3 v3.3.3 // indirect
5456
github.com/gofrs/uuid v4.4.0+incompatible // indirect
5557
github.com/gofrs/uuid/v3 v3.1.2 // indirect
5658
github.com/google/uuid v1.6.0
57-
github.com/gorilla/css v1.0.0 // indirect
58-
github.com/gorilla/handlers v1.5.1 // indirect
59-
github.com/gorilla/mux v1.8.0 // indirect
60-
github.com/gorilla/securecookie v1.1.1 // indirect
61-
github.com/gorilla/sessions v1.2.1 // indirect
59+
github.com/gorilla/css v1.0.1 // indirect
60+
github.com/gorilla/handlers v1.5.2 // indirect
61+
github.com/gorilla/mux v1.8.1 // indirect
62+
github.com/gorilla/securecookie v1.1.2 // indirect
63+
github.com/gorilla/sessions v1.4.0 // indirect
6264
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6365
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
6466
github.com/jackc/pgconn v1.14.3 // indirect
@@ -78,21 +80,21 @@ require (
7880
github.com/markbates/oncer v1.0.0 // indirect
7981
github.com/markbates/safe v1.0.1 // indirect
8082
github.com/mattn/go-colorable v0.1.13 // indirect
81-
github.com/mattn/go-isatty v0.0.19 // indirect
83+
github.com/mattn/go-isatty v0.0.20 // indirect
8284
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
83-
github.com/microcosm-cc/bluemonday v1.0.22 // indirect
85+
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
8486
github.com/mitchellh/go-homedir v1.1.0 // indirect
8587
github.com/monoculum/formam v3.5.5+incompatible // indirect
8688
github.com/patrickmn/go-cache v2.1.0+incompatible
8789
github.com/pmezard/go-difflib v1.0.0 // indirect
88-
github.com/rogpeppe/go-internal v1.11.0 // indirect
90+
github.com/rogpeppe/go-internal v1.13.1 // indirect
8991
github.com/sergi/go-diff v1.3.1 // indirect
9092
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
9193
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
92-
github.com/spf13/cobra v1.7.0 // indirect
94+
github.com/spf13/cobra v1.8.1 // indirect
9395
github.com/spf13/pflag v1.0.5 // indirect
9496
github.com/stretchr/testify v1.8.4 // indirect
95-
golang.org/x/net v0.21.0 // indirect
97+
golang.org/x/net v0.33.0 // indirect
9698
golang.org/x/sync v0.10.0 // indirect
9799
golang.org/x/sys v0.28.0 // indirect
98100
golang.org/x/term v0.27.0 // indirect

0 commit comments

Comments
 (0)