Skip to content

Commit

Permalink
Updated go to 1.21
Browse files Browse the repository at this point in the history
- Updated go to 1.21
- Updated some go dependencies
- Ran go vendor
- Changed to build with image golang:1.23-alpine
  • Loading branch information
shunr-hpe committed Jan 22, 2025
1 parent 932f3b3 commit 033203e
Show file tree
Hide file tree
Showing 614 changed files with 111,178 additions and 42,913 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

### Build Base Stage ###
# Build base just has the packages installed we need.
FROM artifactory.algol60.net/docker.io/library/golang:1.16-alpine AS build-base
FROM artifactory.algol60.net/docker.io/library/golang:1.23-alpine AS build-base

RUN set -ex \
&& apk -U upgrade \
Expand All @@ -50,9 +50,9 @@ FROM base AS builder

# Base image contains everything needed for Go building, just build.
RUN set -ex \
&& go build -v -tags musl -i github.com/Cray-HPE/hms-smd/v2/cmd/smd \
&& go build -v -tags musl -i github.com/Cray-HPE/hms-smd/v2/cmd/smd-loader \
&& go build -v -tags musl -i github.com/Cray-HPE/hms-smd/v2/cmd/smd-init
&& go build -v -tags musl github.com/Cray-HPE/hms-smd/v2/cmd/smd \
&& go build -v -tags musl github.com/Cray-HPE/hms-smd/v2/cmd/smd-loader \
&& go build -v -tags musl github.com/Cray-HPE/hms-smd/v2/cmd/smd-init


### Final Stage ###
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test.unit.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@


### Build Base Stage ###
FROM artifactory.algol60.net/docker.io/library/golang:1.16-alpine AS build-base
FROM artifactory.algol60.net/docker.io/library/golang:1.23-alpine AS build-base

RUN set -ex \
&& apk -U upgrade \
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.test.ct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ services:
networks:
- smd
emulator-loader:
image: artifactory.algol60.net/docker.io/library/golang:1.16-alpine
image: artifactory.algol60.net/docker.io/library/golang:1.23-alpine
command: >
sh -c "apk add curl && sleep 10 &&
curl -X POST -d '{\"RedfishEndpoints\":[{
Expand Down Expand Up @@ -255,4 +255,4 @@ services:
networks:
smd:
aliases:
- x0c0s4b0
- x0c0s4b0
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ services:

# Redfish Emulators
emulator-loader:
image: artifactory.algol60.net/docker.io/library/golang:1.16-alpine
image: artifactory.algol60.net/docker.io/library/golang:1.23-alpine
command: >
sh -c "apk add curl && sleep 10 &&
curl -X POST -d '{\"RedfishEndpoints\":[{
Expand Down Expand Up @@ -186,4 +186,4 @@ services:
networks:
smd:
aliases:
- x1c0s3b0
- x1c0s3b0
53 changes: 34 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/Cray-HPE/hms-smd/v2

go 1.16
go 1.21

require (
github.com/Cray-HPE/hms-base v1.15.0
Expand All @@ -11,25 +11,40 @@ require (
github.com/Cray-HPE/hms-securestorage v1.12.2
github.com/DATA-DOG/go-sqlmock v1.3.3
github.com/Masterminds/squirrel v1.4.0
github.com/frankban/quicktest v1.7.3 // indirect
github.com/golang-migrate/migrate/v4 v4.11.0
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/go-cmp v0.5.1 // indirect
github.com/google/uuid v1.1.1
github.com/golang-migrate/migrate/v4 v4.17.1
github.com/google/uuid v1.4.0
github.com/gorilla/mux v1.7.4
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.0
github.com/lib/pq v1.3.0
github.com/lib/pq v1.10.9
github.com/sirupsen/logrus v1.9.2
)

require (
github.com/confluentinc/confluent-kafka-go v1.7.0 // indirect
github.com/frankban/quicktest v1.7.3 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.1 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/vault/api v1.0.4 // indirect
github.com/hashicorp/vault/sdk v0.1.13 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.3.0 // indirect
github.com/pierrec/lz4 v2.4.1+incompatible // indirect
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.5.1 // indirect
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
golang.org/x/sys v0.0.0-20200817155316-9781c653f443 // indirect
golang.org/x/text v0.3.3 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70 // indirect
google.golang.org/grpc v1.29.1 // indirect
google.golang.org/protobuf v1.25.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
golang.org/x/crypto v0.20.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
)
Loading

0 comments on commit 033203e

Please sign in to comment.