Skip to content

Commit f4cfe8e

Browse files
fixed go-mod cve (#400)
* fixed go-mod cve Signed-off-by: Aleksey Gavrilov <[email protected]> * item 12045 Signed-off-by: Aleksey Gavrilov <[email protected]> * item 18843 Signed-off-by: Aleksey Gavrilov <[email protected]> * Update Dockerfile --------- Signed-off-by: Aleksey Gavrilov <[email protected]> Co-authored-by: techknowlogick <[email protected]>
1 parent a38bb65 commit f4cfe8e

File tree

6 files changed

+60
-1339
lines changed

6 files changed

+60
-1339
lines changed

.github/workflows/codeql-analysis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ jobs:
2323
language: [ 'go' ]
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v1
30+
uses: github/codeql-action/init@v3
3131
with:
3232
languages: ${{ matrix.language }}
3333

3434
- name: Autobuild
35-
uses: github/codeql-action/autobuild@v1
35+
uses: github/codeql-action/autobuild@v3
3636

3737
#- run: |
3838
# make bootstrap
3939
# make release
4040

4141
- name: Perform CodeQL Analysis
42-
uses: github/codeql-action/analyze@v1
42+
uses: github/codeql-action/analyze@v3

.github/workflows/docker.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Install Go
19-
uses: actions/setup-go@v2
19+
uses: actions/setup-go@v5
2020
with:
21-
go-version: "1.19.x"
21+
go-version: "1.23.x"
2222

2323
- name: Checkout code
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525

2626
- name: Get Build Data
2727
id: info
@@ -33,7 +33,7 @@ jobs:
3333
3434
- name: Docker meta
3535
id: docker_meta
36-
uses: crazy-max/ghaction-docker-meta@v1
36+
uses: crazy-max/ghaction-docker-meta@v5
3737
with:
3838
images: cesanta/docker_auth
3939
tag-edge: true
@@ -43,28 +43,28 @@ jobs:
4343
{{major}}.{{minor}}
4444
4545
- name: Set up QEMU
46-
uses: docker/setup-qemu-action@v1
46+
uses: docker/setup-qemu-action@v3
4747
with:
4848
platforms: all
4949

5050
- name: Set up Docker Buildx
5151
id: buildx
52-
uses: docker/setup-buildx-action@v1
52+
uses: docker/setup-buildx-action@v3
5353
with:
5454
install: true
5555
version: latest
5656
# TODO: Remove driver-opts once fix is released docker/buildx#386
5757
driver-opts: image=moby/buildkit:master
5858

5959
- name: Login to DockerHub
60-
uses: docker/login-action@v1
60+
uses: docker/login-action@v3
6161
with:
6262
username: ${{ secrets.DOCKER_USERNAME }}
6363
password: ${{ secrets.DOCKER_PASSWORD }}
6464
if: github.event_name == 'push'
6565

6666
- name: Build and Push
67-
uses: docker/build-push-action@v2
67+
uses: docker/build-push-action@v6
6868
with:
6969
context: auth_server
7070
file: auth_server/Dockerfile

.github/workflows/go_test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-version: [1.17.x, 1.18.x, 1.19.x, 1.20.x, 1.21.x]
7+
go-version: [1.23.x]
88
os: [ubuntu-latest]
99
runs-on: ${{ matrix.os }}
1010
steps:
1111
- name: Install Go
12-
uses: actions/setup-go@v2
12+
uses: actions/setup-go@v5
1313
with:
1414
go-version: ${{ matrix.go-version }}
1515
- name: Checkout code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
- name: Test
1818
run: |
1919
cd auth_server

auth_server/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:1.21-alpine3.19 as build
1+
FROM golang:1.23-alpine3.21 AS build
22

33
ARG VERSION
4-
ENV VERSION "${VERSION}"
4+
ENV VERSION="${VERSION}"
55
ARG BUILD_ID
6-
ENV BUILD_ID "${BUILD_ID}"
6+
ENV BUILD_ID="${BUILD_ID}"
77
ARG CGO_EXTRA_CFLAGS
88

99
RUN apk add -U --no-cache ca-certificates make git gcc musl-dev binutils-gold
@@ -12,7 +12,7 @@ COPY . /build
1212
WORKDIR /build
1313
RUN make build
1414

15-
FROM alpine:3.19
15+
FROM alpine:3.21
1616
COPY --from=build /build/auth_server /docker_auth/
1717
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
1818
ENTRYPOINT ["/docker_auth/auth_server"]

auth_server/go.mod

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cesanta/docker_auth/auth_server
22

3-
go 1.17
3+
go 1.23
44

55
require (
66
cloud.google.com/go/storage v1.29.0
@@ -9,18 +9,17 @@ require (
99
github.com/coreos/go-oidc/v3 v3.9.0
1010
github.com/dchest/uniuri v0.0.0-20220929095258-3027df40b6ce
1111
github.com/deckarep/golang-set v1.8.0
12-
github.com/docker/distribution v2.8.1+incompatible
12+
github.com/docker/distribution v2.8.2-beta.1+incompatible
1313
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
1414
github.com/go-ldap/ldap v3.0.3+incompatible
1515
github.com/go-redis/redis v6.15.9+incompatible
1616
github.com/go-sql-driver/mysql v1.6.0
1717
github.com/lib/pq v1.10.7
1818
github.com/mattn/go-sqlite3 v2.0.3+incompatible
19-
github.com/schwarmco/go-cartesian-product v0.0.0-20180515110546-d5ee747a6dc9
2019
github.com/syndtr/goleveldb v1.0.0
2120
go.mongodb.org/mongo-driver v1.10.2
22-
golang.org/x/crypto v0.17.0
23-
golang.org/x/net v0.17.0
21+
golang.org/x/crypto v0.31.0
22+
golang.org/x/net v0.33.0
2423
golang.org/x/oauth2 v0.13.0
2524
google.golang.org/api v0.126.0
2625
gopkg.in/fsnotify.v1 v1.4.7
@@ -35,13 +34,13 @@ require (
3534
cloud.google.com/go/compute/metadata v0.2.3 // indirect
3635
cloud.google.com/go/iam v0.13.0 // indirect
3736
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
38-
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
37+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
3938
github.com/goccy/go-json v0.9.11 // indirect
4039
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4140
github.com/golang/mock v1.6.0 // indirect
42-
github.com/golang/protobuf v1.5.3 // indirect
41+
github.com/golang/protobuf v1.5.4 // indirect
4342
github.com/golang/snappy v0.0.4 // indirect
44-
github.com/google/go-cmp v0.5.9 // indirect
43+
github.com/google/go-cmp v0.6.0 // indirect
4544
github.com/google/s2a-go v0.1.4 // indirect
4645
github.com/google/uuid v1.3.0 // indirect
4746
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
@@ -61,17 +60,16 @@ require (
6160
github.com/xdg-go/stringprep v1.0.3 // indirect
6261
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
6362
go.opencensus.io v0.24.0 // indirect
64-
golang.org/x/sync v0.2.0 // indirect
65-
golang.org/x/sys v0.15.0 // indirect
66-
golang.org/x/text v0.14.0 // indirect
67-
golang.org/x/tools v0.7.0 // indirect
63+
golang.org/x/sync v0.10.0 // indirect
64+
golang.org/x/sys v0.28.0 // indirect
65+
golang.org/x/text v0.21.0 // indirect
6866
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
6967
google.golang.org/appengine v1.6.8 // indirect
7068
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
7169
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
7270
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
73-
google.golang.org/grpc v1.55.0 // indirect
74-
google.golang.org/protobuf v1.31.0 // indirect
71+
google.golang.org/grpc v1.56.3 // indirect
72+
google.golang.org/protobuf v1.33.0 // indirect
7573
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
7674
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
7775
lukechampine.com/uint128 v1.2.0 // indirect

0 commit comments

Comments
 (0)