Skip to content

Commit

Permalink
update go version and fix a unit test bug (#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
mc256 authored Feb 4, 2024
1 parent 053cefd commit 4dec5a9
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 650 deletions.
2 changes: 1 addition & 1 deletion DETAILS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The prebuild image is available in

```url
ghcr.io/mc256/starlight/proxy:latest
registry.yuri.moe/starlight-proxy:latest
reg.yuri.moe/starlight-proxy:latest
```

Please first clone this project and go to the proxy demo folder
Expand Down
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ update-protobuf:
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
client/api/daemon.proto

.PHONY: check-env-file
check-env-file:
@if [ ! -f .env ]; then cp .env_example .env; fi

.PHONY: copy-env-file
copy-env-file:
cp .env .env_example
sed -i 's/=.*/=/g' .env_example


######################################################################
###### Platform dependent build
Expand Down
2 changes: 1 addition & 1 deletion demo/deb-package/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ ENV TZ=Etc/UTC

RUN apt update -y && apt upgrade -y
RUN apt install -y tzdata curl wget git dpkg-dev gpg build-essential debhelper bind9-utils
RUN wget -q https://go.dev/dl/go1.18.4.linux-$ARCH.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.4.linux-$ARCH.tar.gz
RUN wget -q https://go.dev/dl/go1.20.8.linux-$ARCH.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.20.8.linux-$ARCH.tar.gz
COPY . .
RUN ARCH=$ARCH && make create-deb-package.$ARCH upload-deb-package.$ARCH
29 changes: 16 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module github.com/mc256/starlight

go 1.18
go 1.20

require (
github.com/containerd/containerd v1.6.18
github.com/containerd/containerd v1.6.26
github.com/containerd/continuity v0.3.0
github.com/google/go-containerregistry v0.5.1
github.com/google/uuid v1.3.0
Expand All @@ -13,40 +13,42 @@ require (
github.com/hanwen/go-fuse/v2 v2.1.1-0.20221003202731-4c25c9c1eece
github.com/lib/pq v1.10.6
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/sirupsen/logrus v1.9.3

// newer version causes issue #24
github.com/urfave/cli/v2 v2.3.0
go.etcd.io/bbolt v1.3.6
go.etcd.io/bbolt v1.3.7
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
golang.org/x/sync v0.3.0
golang.org/x/sys v0.13.0
google.golang.org/grpc v1.56.3
google.golang.org/grpc v1.58.3
)

require (
github.com/pelletier/go-toml v1.9.5
google.golang.org/protobuf v1.30.0
google.golang.org/protobuf v1.31.0
)

require (
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
)

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.9.6 // indirect
github.com/Microsoft/hcsshim v0.9.10 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/fifo v1.0.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.4.1 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/containerd/ttrpc v1.1.2 // indirect
github.com/containerd/typeurl v1.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
github.com/docker/cli v20.10.17+incompatible // indirect
Expand All @@ -59,15 +61,16 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/joho/godotenv v1.5.1
github.com/klauspost/compress v1.15.6 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/signal v0.7.0 // indirect
github.com/opencontainers/runc v1.1.12 // indirect
github.com/opencontainers/selinux v1.10.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/vbauerster/mpb/v8 v8.4.0
go.opencensus.io v0.23.0 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
)

replace github.com/containerd/containerd v1.6.18 => github.com/containerd/containerd v1.6.26
Loading

0 comments on commit 4dec5a9

Please sign in to comment.