Skip to content

Commit 1141705

Browse files
authored
Improvement: Image pull (#173)
* Only pull relevant image for this runtime * Update packages
1 parent 27f9dac commit 1141705

4 files changed

Lines changed: 153 additions & 180 deletions

File tree

environment/docker/container.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"context"
66
"fmt"
77
"io"
8+
"runtime"
89
"strconv"
910
"strings"
1011
"time"
@@ -401,7 +402,7 @@ func (e *Environment) ensureImageExists(image string) error {
401402
}
402403

403404
// Get the ImagePullOptions.
404-
imagePullOptions := dockerImage.PullOptions{All: false}
405+
imagePullOptions := dockerImage.PullOptions{All: false, Platform: runtime.GOOS + "/" + runtime.GOARCH}
405406
if registryAuth != nil {
406407
b64, err := registryAuth.Base64()
407408
if err != nil {

go.mod

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/pelican-dev/wings
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
emperror.dev/errors v0.8.1
@@ -9,51 +9,53 @@ require (
99
github.com/apex/log v1.9.0
1010
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1111
github.com/beevik/etree v1.6.0
12-
github.com/buger/jsonparser v1.1.1
12+
github.com/buger/jsonparser v1.1.2
1313
github.com/cenkalti/backoff/v4 v4.3.0
1414
github.com/creasty/defaults v1.8.0
15-
github.com/docker/docker v28.5.1+incompatible
15+
github.com/docker/docker v28.5.2+incompatible
1616
github.com/docker/go-connections v0.6.0
17-
github.com/fatih/color v1.18.0
17+
github.com/fatih/color v1.19.0
1818
github.com/franela/goblin v0.0.0-20211003143422-0a4f594942bf
19-
github.com/gabriel-vasile/mimetype v1.4.10
20-
github.com/gammazero/workerpool v1.1.3
19+
github.com/gabriel-vasile/mimetype v1.4.13
20+
github.com/gammazero/workerpool v1.2.1
2121
github.com/gbrlsnchs/jwt/v3 v3.0.1
22-
github.com/gin-gonic/gin v1.10.1
22+
github.com/gin-gonic/gin v1.12.0
2323
github.com/glebarez/sqlite v1.11.0
24-
github.com/go-co-op/gocron/v2 v2.16.5
25-
github.com/goccy/go-json v0.10.5
24+
github.com/go-co-op/gocron/v2 v2.19.1
25+
github.com/goccy/go-json v0.10.6
2626
github.com/google/uuid v1.6.0
2727
github.com/gorilla/websocket v1.5.3
2828
github.com/iancoleman/strcase v0.3.0
2929
github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0
3030
github.com/juju/ratelimit v1.0.2
31-
github.com/klauspost/compress v1.18.0
31+
github.com/klauspost/compress v1.18.5
3232
github.com/klauspost/pgzip v1.2.6
3333
github.com/magiconair/properties v1.8.10
3434
github.com/mattn/go-colorable v0.1.14
35-
github.com/mholt/archives v0.1.3
35+
github.com/mholt/archives v0.1.5
3636
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
3737
github.com/patrickmn/go-cache v2.1.0+incompatible
38-
github.com/pkg/sftp v1.13.9
38+
github.com/pkg/sftp v1.13.10
3939
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
4040
github.com/shirou/gopsutil/v3 v3.24.5
41-
github.com/spf13/cobra v1.10.1
41+
github.com/spf13/cobra v1.10.2
4242
github.com/stretchr/testify v1.11.1
4343
github.com/tidwall/gjson v1.18.0
44+
github.com/tidwall/pretty v1.2.0
4445
github.com/tidwall/sjson v1.2.5
45-
golang.org/x/crypto v0.41.0
46-
golang.org/x/sync v0.16.0
47-
golang.org/x/sys v0.35.0
48-
gopkg.in/ini.v1 v1.67.0
46+
golang.org/x/crypto v0.49.0
47+
golang.org/x/sync v0.20.0
48+
golang.org/x/sys v0.42.0
49+
gopkg.in/ini.v1 v1.67.1
4950
gopkg.in/yaml.v2 v2.4.0
5051
gopkg.in/yaml.v3 v3.0.1
51-
gorm.io/gorm v1.30.3
52+
gorm.io/gorm v1.31.1
5253
)
5354

5455
require (
5556
github.com/atotto/clipboard v0.1.4 // indirect
5657
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
58+
github.com/bytedance/gopkg v0.1.3 // indirect
5759
github.com/catppuccin/go v0.3.0 // indirect
5860
github.com/charmbracelet/bubbles v0.21.0 // indirect
5961
github.com/charmbracelet/bubbletea v1.3.4 // indirect
@@ -64,6 +66,7 @@ require (
6466
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
6567
github.com/charmbracelet/x/term v0.2.1 // indirect
6668
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
69+
github.com/goccy/go-yaml v1.19.2 // indirect
6770
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
6871
github.com/mattn/go-localereader v0.0.1 // indirect
6972
github.com/mattn/go-runewidth v0.0.16 // indirect
@@ -72,25 +75,27 @@ require (
7275
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
7376
github.com/muesli/cancelreader v0.2.2 // indirect
7477
github.com/muesli/termenv v0.16.0 // indirect
78+
github.com/quic-go/qpack v0.6.0 // indirect
79+
github.com/quic-go/quic-go v0.59.0 // indirect
7580
github.com/rivo/uniseg v0.4.7 // indirect
81+
github.com/spf13/afero v1.15.0 // indirect
7682
github.com/tidwall/match v1.1.1 // indirect
77-
github.com/tidwall/pretty v1.2.0 // indirect
7883
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
84+
go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
7985
)
8086

8187
require (
8288
github.com/Microsoft/go-winio v0.6.1 // indirect
8389
github.com/Microsoft/hcsshim v0.12.2 // indirect
84-
github.com/STARRY-S/zip v0.2.1 // indirect
85-
github.com/andybalholm/brotli v1.1.2-0.20250424173009-453214e765f3 // indirect
90+
github.com/STARRY-S/zip v0.2.3 // indirect
91+
github.com/andybalholm/brotli v1.2.0 // indirect
8692
github.com/bodgit/plumbing v1.3.0 // indirect
87-
github.com/bodgit/sevenzip v1.6.0 // indirect
93+
github.com/bodgit/sevenzip v1.6.1 // indirect
8894
github.com/bodgit/windows v1.0.1 // indirect
89-
github.com/bytedance/sonic v1.11.6 // indirect
90-
github.com/bytedance/sonic/loader v0.1.1 // indirect
95+
github.com/bytedance/sonic v1.15.0 // indirect
96+
github.com/bytedance/sonic/loader v0.5.0 // indirect
9197
github.com/charmbracelet/huh v0.7.0
92-
github.com/cloudwego/base64x v0.1.4 // indirect
93-
github.com/cloudwego/iasm v0.2.0 // indirect
98+
github.com/cloudwego/base64x v0.1.6 // indirect
9499
github.com/containerd/errdefs v0.3.0 // indirect
95100
github.com/containerd/errdefs/pkg v0.3.0 // indirect
96101
github.com/containerd/log v0.1.0 // indirect
@@ -100,56 +105,54 @@ require (
100105
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
101106
github.com/dustin/go-humanize v1.0.1 // indirect
102107
github.com/felixge/httpsnoop v1.0.4 // indirect
103-
github.com/gammazero/deque v0.2.1 // indirect
104-
github.com/gin-contrib/sse v0.1.0 // indirect
108+
github.com/gammazero/deque v1.2.1 // indirect
109+
github.com/gin-contrib/sse v1.1.0 // indirect
105110
github.com/glebarez/go-sqlite v1.22.0 // indirect
106111
github.com/go-logr/logr v1.4.2 // indirect
107112
github.com/go-logr/stdr v1.2.2 // indirect
108113
github.com/go-ole/go-ole v1.2.6 // indirect
109114
github.com/go-playground/locales v0.14.1 // indirect
110115
github.com/go-playground/universal-translator v0.18.1 // indirect
111-
github.com/go-playground/validator/v10 v10.20.0 // indirect
112-
github.com/hashicorp/errwrap v1.1.0 // indirect
113-
github.com/hashicorp/go-multierror v1.1.1 // indirect
116+
github.com/go-playground/validator/v10 v10.30.1 // indirect
114117
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
115118
github.com/inconshreveable/mousetrap v1.1.0 // indirect
116119
github.com/jinzhu/inflection v1.0.0 // indirect
117120
github.com/jinzhu/now v1.1.5 // indirect
118121
github.com/jonboulle/clockwork v0.5.0 // indirect
119122
github.com/json-iterator/go v1.1.12 // indirect
120-
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
123+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
121124
github.com/kr/fs v0.1.0 // indirect
122125
github.com/leodido/go-urn v1.4.0 // indirect
123126
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
124127
github.com/magefile/mage v1.15.0 // indirect
125128
github.com/mattn/go-isatty v0.0.20 // indirect
126-
github.com/minio/minlz v1.0.0 // indirect
129+
github.com/minio/minlz v1.0.1 // indirect
127130
github.com/moby/docker-image-spec v1.3.1 // indirect
128131
github.com/moby/sys/atomicwriter v0.1.0 // indirect
129132
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
130133
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
131134
github.com/modern-go/reflect2 v1.0.2 // indirect
132135
github.com/morikuni/aec v1.0.0 // indirect
133136
github.com/ncruces/go-strftime v0.1.9 // indirect
134-
github.com/nwaples/rardecode/v2 v2.1.0 // indirect
137+
github.com/nwaples/rardecode/v2 v2.2.0 // indirect
135138
github.com/opencontainers/go-digest v1.0.0 // indirect
136139
github.com/opencontainers/image-spec v1.1.0 // indirect
137-
github.com/pelletier/go-toml/v2 v2.2.2
138-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
140+
github.com/pelletier/go-toml/v2 v2.2.4
141+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
139142
github.com/pkg/errors v0.9.1 // indirect
140143
github.com/pmezard/go-difflib v1.0.0 // indirect
141144
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
142145
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
143146
github.com/robfig/cron/v3 v3.0.1 // indirect
144147
github.com/shoenig/go-m1cpu v0.1.6 // indirect
145148
github.com/sirupsen/logrus v1.9.3 // indirect
146-
github.com/sorairolake/lzip-go v0.3.5 // indirect
149+
github.com/sorairolake/lzip-go v0.3.8 // indirect
147150
github.com/spf13/pflag v1.0.9 // indirect
148151
github.com/tklauser/go-sysconf v0.3.12 // indirect
149152
github.com/tklauser/numcpus v0.6.1 // indirect
150153
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
151-
github.com/ugorji/go/codec v1.2.12 // indirect
152-
github.com/ulikunitz/xz v0.5.12 // indirect
154+
github.com/ugorji/go/codec v1.3.1 // indirect
155+
github.com/ulikunitz/xz v0.5.15 // indirect
153156
github.com/yusufpapurcu/wmi v1.2.4 // indirect
154157
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
155158
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
@@ -160,15 +163,15 @@ require (
160163
go.opentelemetry.io/otel/trace v1.34.0 // indirect
161164
go.uber.org/multierr v1.11.0 // indirect
162165
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
163-
golang.org/x/arch v0.8.0 // indirect
164-
golang.org/x/mod v0.26.0 // indirect
165-
golang.org/x/net v0.42.0 // indirect
166-
golang.org/x/text v0.28.0 // indirect
166+
golang.org/x/arch v0.22.0 // indirect
167+
golang.org/x/mod v0.33.0 // indirect
168+
golang.org/x/net v0.51.0 // indirect
169+
golang.org/x/text v0.35.0 // indirect
167170
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
168-
golang.org/x/tools v0.35.0 // indirect
171+
golang.org/x/tools v0.42.0 // indirect
169172
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
170173
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
171-
google.golang.org/protobuf v1.34.2 // indirect
174+
google.golang.org/protobuf v1.36.10 // indirect
172175
gotest.tools/v3 v3.0.2 // indirect
173176
modernc.org/libc v1.49.3 // indirect
174177
modernc.org/mathutil v1.6.0 // indirect

0 commit comments

Comments
 (0)