Skip to content

Commit

Permalink
pkg/{config,files,recipe}: Update image versions go version and config
Browse files Browse the repository at this point in the history
Change-Id: I28a9e4ddde272305f67a0d4282a70a785fb560bd
  • Loading branch information
dlamarmorgan committed Aug 4, 2023
1 parent 5cd2173 commit 057b4a9
Show file tree
Hide file tree
Showing 20 changed files with 477 additions and 460 deletions.
23 changes: 19 additions & 4 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,27 @@ Build image contains all the tools required to create local builds.

To publish a new `storjup/build` image:

0. `go install github.com/magefile/mage@v1.11.0`
1. `mage dockerBaseBuild` (only build)
2. `mage dockerBasePublish` (build and publish)
0. `go install github.com/magefile/mage`
1. `mage dockerBuildBuild` (only build)
2. `mage dockerBuildPublish` (build and publish)
3. New tag is saved to `build.last`. Please commit that file with your PR.
4. Use the new tag in `edge.Dockerfile` and `storj.Dockerfile`

Note: This process is assuming that you already authorized yourself with `img.dev.storj.io` with `docker login`.

Note: publishing base image is very similar
Note: publishing base image is very similar

## Update Storj image

Storj image contains all the binaries required to run the satellite.

To publish a new `storjup/storj` image:

0. `go install github.com/magefile/mage`
1. `mage DockerStorj <latest release version> <false>` (only build)
2. `mage DockerStorj <latest release version> <true>` (build and publish)
3. Use the new tag in recipe files

Note: This process is assuming that you already authorized yourself with `img.dev.storj.io` with `docker login`.

Note: publishing edge image is very similar
4 changes: 2 additions & 2 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION 0.6
FROM golang:1.18
FROM golang:1.19
WORKDIR /go/storj-up

lint:
Expand Down Expand Up @@ -43,7 +43,7 @@ test:
integration:
FROM earthly/dind:ubuntu
RUN apt-get update && apt-get install -y docker-compose-plugin gcc
RUN bash -c "curl --fail -L https://go.dev/dl/go1.18.10.linux-amd64.tar.gz | tar -C /usr/local -xz && cp /usr/local/go/bin/go /usr/local/bin/go"
RUN bash -c "curl --fail -L https://go.dev/dl/go1.19.1.linux-amd64.tar.gz | tar -C /usr/local -xz && cp /usr/local/go/bin/go /usr/local/bin/go"
RUN go install github.com/rclone/rclone@v1.59.1
RUN go install storj.io/storj/cmd/uplink@latest
RUN go install storj.io/storjscan/cmd/storjscan@latest
Expand Down
2 changes: 1 addition & 1 deletion base.last
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230616-1
20230804-1
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module storj.io/storj-up

go 1.18
go 1.19

require (
github.com/compose-spec/compose-go v1.0.3
Expand Down
3 changes: 1 addition & 2 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"sort"
Expand Down Expand Up @@ -348,7 +347,7 @@ func doOnMissing(containerName string, repoName string, action func(string, stri

// writeDockerTag persist the last used docker tag to a file.
func writeDockerTag(tagFile string, tag string) error {
return ioutil.WriteFile(tagFile, []byte(tag), 0o644)
return os.WriteFile(tagFile, []byte(tag), 0o644)
}

// ListVersions prints out the available container / release versions.
Expand Down
63 changes: 30 additions & 33 deletions pkg/config/gen/go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
module gen

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.2
github.com/zeebo/errs v1.3.0
storj.io/gateway-mt v1.55.1
storj.io/storj v1.79.4
storj.io/gateway-mt v1.58.1
storj.io/storj v1.83.2
storj.io/storj-up v1.0.0
storj.io/storjscan v1.0.2
storj.io/storjscan v1.0.3
)

require (
cloud.google.com/go/compute v1.10.0 // indirect
cloud.google.com/go/compute v1.19.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
git.apache.org/thrift.git v0.13.0 // indirect
github.com/Azure/azure-pipeline-go v0.2.2 // indirect
github.com/Azure/azure-storage-blob-go v0.10.0 // indirect
Expand Down Expand Up @@ -66,15 +67,16 @@ require (
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gomodule/redigo v1.8.3 // indirect
github.com/google/flatbuffers v1.12.1 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/pprof v0.0.0-20211108044417-e9b028704de0 // indirect
github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/schema v1.2.0 // indirect
Expand All @@ -86,15 +88,12 @@ require (
github.com/hashicorp/raft v1.3.10 // indirect
github.com/holiman/uint256 v1.2.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.13.0 // indirect
github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.1 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.12.0 // indirect
github.com/jackc/pgx/v4 v4.17.1 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/jackc/pgx/v5 v5.4.1 // indirect
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down Expand Up @@ -198,25 +197,25 @@ require (
github.com/zeebo/incenc v0.0.0-20180505221441-0d92902eec54 // indirect
github.com/zeebo/mwc v0.0.4 // indirect
github.com/zyedidia/generic v1.2.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
golang.org/x/tools v0.2.0 // indirect
google.golang.org/api v0.100.0 // indirect
golang.org/x/tools v0.6.0 // indirect
google.golang.org/api v0.118.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.55.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
Expand All @@ -227,15 +226,13 @@ require (
gopkg.in/webhelp.v1 v1.0.0-20170530084242-3f30213e4c49 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
storj.io/common v0.0.0-20230602145716-d6ea82d58b3d // indirect
storj.io/common v0.0.0-20230719104100-cb5eec2edc30 // indirect
storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840 // indirect
storj.io/drpc v0.0.33 // indirect
storj.io/minio v0.0.0-20230509071714-0cbc90f649b1 // indirect
storj.io/minio v0.0.0-20230627070725-370d887aacde // indirect
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect
storj.io/picobuf v0.0.1 // indirect
storj.io/private v0.0.0-20230504144224-245360dc8212 // indirect
storj.io/uplink v1.10.1-0.20230602205250-0fac01fa40c8 // indirect
storj.io/private v0.0.0-20230707205547-3f3b667f6ac0 // indirect
storj.io/uplink v1.10.1-0.20230628184638-0e6829c81f5c // indirect
storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 // indirect
)

replace google.golang.org/grpc => google.golang.org/grpc v1.29.0
Loading

0 comments on commit 057b4a9

Please sign in to comment.