Skip to content

Commit 9bbfe3f

Browse files
rokroskarrokroskar
authored
Merge branch 'main' into dependabot/go_modules/github.com/docker/go-connections-0.7.0
2 parents 4e9e897 + 74c5920 commit 9bbfe3f

21 files changed

Lines changed: 305 additions & 246 deletions

File tree

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@ update-builder-versions:
143143
@for builder in $(BUILDERS); do \
144144
FILE="builders/$$builder/builder.toml"; \
145145
go run ./scripts/*go builder -f $$FILE set-buildpacks "$(RELEASE_VERSION)"; \
146-
go run ./scripts/*go builder -f $$FILE set-builder "$(RELEASE_VERSION)"; \
147146
go run ./scripts/*go builder -f $$FILE set-runner "$(RELEASE_VERSION)"; \
147+
if [ "$$builder" = "cuda-selector" ]; then \
148+
go run ./scripts/*go builder -f $$FILE set-builder "$(RELEASE_VERSION)"; \
149+
fi \
148150
done
149151

150152
.PHONY: update-action-versions

‎actions/build-image/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ inputs:
1212
builder-version:
1313
description: Builder version to use
1414
required: false
15-
default: "0.5.0"
15+
default: "0.5.1"
1616
run-image:
1717
description: Run image to use - defaults to using the image bundled with the builder
1818
default: ""

‎builders/cuda-selector/builder.toml‎

Lines changed: 92 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,221 +1,254 @@
11
description = "CUDA enabled builder for Renku frontends and environments."
22

3-
[[build.env]]
4-
name = "BP_RENKU_FRONTENDS"
5-
value = "vscodium"
6-
73
[[buildpacks]]
84
uri = "../../buildpacks/renku-variables"
9-
version = "0.5.0"
5+
version = "0.5.1"
106

117
[[buildpacks]]
128
uri = "../../buildpacks/vscodium"
13-
version = "0.5.0"
9+
version = "0.5.1"
1410

1511
[[buildpacks]]
1612
uri = "../../buildpacks/conda-nodefaults"
17-
version = "0.5.0"
13+
version = "0.5.1"
1814

1915
[[buildpacks]]
2016
uri = "../../buildpacks/kernel-installer"
21-
version = "0.5.0"
17+
version = "0.5.1"
2218

2319
[[buildpacks]]
2420
uri = "../../buildpacks/jupyterlab"
25-
version = "0.5.0"
21+
version = "0.5.1"
2622

2723
[[buildpacks]]
2824
uri = "../../buildpacks/ttyd"
29-
version = "0.5.0"
25+
version = "0.5.1"
3026

3127
[[buildpacks]]
3228
uri = "../../buildpacks/python-dependency-manager"
33-
version = "0.5.0"
29+
version = "0.5.1"
3430

3531
[[buildpacks]]
3632
uri = "../../buildpacks/renv"
37-
version = "0.5.0"
33+
version = "0.5.1"
3834

3935
[[buildpacks]]
4036
uri = "../../buildpacks/r-dependency-manager"
41-
version = "0.5.0"
37+
version = "0.5.1"
4238

4339
[[buildpacks]]
4440
uri = "../../buildpacks/rstudio"
45-
version = "0.5.0"
41+
version = "0.5.1"
4642

4743
[[buildpacks]]
4844
uri = "../../buildpacks/init-scripts"
49-
version = "0.5.0"
45+
version = "0.5.1"
5046

5147
[[buildpacks]]
5248
uri = "docker://docker.io/paketobuildpacks/python:2.38.0"
5349
version = "2.38.0"
5450

5551
[[buildpacks]]
56-
id = "paketo-buildpacks/miniconda"
5752
uri = "docker://docker.io/paketobuildpacks/miniconda:0.11.5"
53+
id = "paketo-buildpacks/miniconda"
5854
version = "0.11.5"
5955

6056
[[buildpacks]]
61-
id = "heroku/deb-packages"
6257
uri = "docker://docker.io/heroku/buildpack-deb-packages:0.2.0"
58+
id = "heroku/deb-packages"
6359
version = "0.2.0"
6460

6561
[[buildpacks]]
6662
uri = "../../buildpacks/homebrew"
67-
version = "0.5.0"
63+
version = "0.5.1"
6864

6965
[[buildpacks]]
7066
uri = "../../buildpacks/r-conda"
71-
version = "0.5.0"
72-
73-
[lifecycle]
74-
version = "0.20.19"
67+
version = "0.5.1"
7568

7669
[[order]]
7770

7871
[[order.group]]
7972
id = "renku/conda-nodefaults"
80-
version = "0.5.0"
73+
version = "0.5.1"
8174
optional = true
75+
8276
[[order.group]]
83-
id = "paketo-buildpacks/miniconda"
84-
version = "0.11.5"
77+
id = "paketo-buildpacks/miniconda"
78+
version = "0.11.5"
79+
8580
[[order.group]]
8681
id = "paketo-buildpacks/python"
8782
version = "2.38.0"
83+
8884
[[order.group]]
8985
id = "renku/python-dependency-manager"
90-
version = "0.5.0"
86+
version = "0.5.1"
87+
9188
[[order.group]]
9289
id = "renku/renku-variables"
93-
version = "0.5.0"
90+
version = "0.5.1"
91+
9492
[[order.group]]
9593
id = "renku/jupyterlab"
96-
version = "0.5.0"
94+
version = "0.5.1"
95+
9796
[[order.group]]
9897
id = "renku/kernel-installer"
99-
version = "0.5.0"
98+
version = "0.5.1"
99+
100100
[[order.group]]
101101
id = "heroku/deb-packages"
102102
version = "0.2.0"
103103
optional = true
104+
104105
[[order.group]]
105106
id = "renku/homebrew"
106-
version = "0.5.0"
107+
version = "0.5.1"
107108
optional = true
109+
108110
[[order.group]]
109111
id = "renku/init-scripts"
110-
version = "0.5.0"
112+
version = "0.5.1"
111113
optional = true
112114

113115
[[order]]
116+
114117
[[order.group]]
115118
id = "renku/conda-nodefaults"
116-
version = "0.5.0"
119+
version = "0.5.1"
117120
optional = true
121+
118122
[[order.group]]
119123
id = "paketo-buildpacks/python"
120124
version = "2.38.0"
125+
121126
[[order.group]]
122127
id = "renku/python-dependency-manager"
123-
version = "0.5.0"
128+
version = "0.5.1"
129+
124130
[[order.group]]
125131
id = "renku/renku-variables"
126-
version = "0.5.0"
132+
version = "0.5.1"
133+
127134
[[order.group]]
128135
id = "renku/ttyd"
129-
version = "0.5.0"
136+
version = "0.5.1"
137+
130138
[[order.group]]
131139
id = "heroku/deb-packages"
132140
version = "0.2.0"
133141
optional = true
142+
134143
[[order.group]]
135144
id = "renku/homebrew"
136-
version = "0.5.0"
145+
version = "0.5.1"
137146
optional = true
147+
138148
[[order.group]]
139149
id = "renku/init-scripts"
140-
version = "0.5.0"
150+
version = "0.5.1"
141151
optional = true
142152

143153
[[order]]
144154

145155
[[order.group]]
146156
id = "renku/conda-nodefaults"
147-
version = "0.5.0"
157+
version = "0.5.1"
148158
optional = true
159+
149160
[[order.group]]
150161
id = "paketo-buildpacks/python"
151162
version = "2.38.0"
163+
152164
[[order.group]]
153165
id = "renku/python-dependency-manager"
154-
version = "0.5.0"
166+
version = "0.5.1"
167+
155168
[[order.group]]
156169
id = "renku/renku-variables"
157-
version = "0.5.0"
170+
version = "0.5.1"
171+
158172
[[order.group]]
159173
id = "renku/vscodium"
160-
version = "0.5.0"
174+
version = "0.5.1"
175+
161176
[[order.group]]
162177
id = "heroku/deb-packages"
163178
version = "0.2.0"
164179
optional = true
180+
165181
[[order.group]]
166182
id = "renku/homebrew"
167-
version = "0.5.0"
183+
version = "0.5.1"
168184
optional = true
185+
169186
[[order.group]]
170187
id = "renku/init-scripts"
171-
version = "0.5.0"
188+
version = "0.5.1"
172189
optional = true
173190

174191
[[order]]
175192

176193
[[order.group]]
177194
id = "renku/renku-variables"
178-
version = "0.5.0"
195+
version = "0.5.1"
196+
179197
[[order.group]]
180-
id = "paketo-buildpacks/miniconda"
181-
version = "0.11.5"
198+
id = "paketo-buildpacks/miniconda"
199+
version = "0.11.5"
200+
182201
[[order.group]]
183-
id = "renku/r-conda"
184-
version = "0.5.0"
202+
id = "renku/r-conda"
203+
version = "0.5.1"
204+
185205
[[order.group]]
186206
id = "renku/renv"
187-
version = "0.5.0"
207+
version = "0.5.1"
208+
188209
[[order.group]]
189210
id = "renku/r-dependency-manager"
190-
version = "0.5.0"
211+
version = "0.5.1"
212+
191213
[[order.group]]
192214
id = "renku/rstudio"
193-
version = "0.5.0"
215+
version = "0.5.1"
216+
194217
[[order.group]]
195218
id = "heroku/deb-packages"
196219
version = "0.2.0"
197220
optional = true
221+
198222
[[order.group]]
199223
id = "renku/homebrew"
200-
version = "0.5.0"
224+
version = "0.5.1"
201225
optional = true
226+
202227
[[order.group]]
203228
id = "renku/init-scripts"
204-
version = "0.5.0"
229+
version = "0.5.1"
205230
optional = true
206231

207232
[build]
208-
image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/cuda-build-image:0.5.0"
233+
image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/cuda-build-image:0.5.1"
234+
235+
[[build.env]]
236+
name = "BP_RENKU_FRONTENDS"
237+
value = "vscodium"
209238

210239
[run]
211-
[[run.images]]
212-
image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/cuda-run-image:0.5.0"
213-
mirrors = []
240+
241+
[[run.images]]
242+
image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/cuda-run-image:0.5.1"
243+
mirrors = []
244+
245+
[lifecycle]
246+
version = "0.20.19"
214247

215248
[[targets]]
216-
os = "linux"
217249
arch = "amd64"
250+
os = "linux"
218251

219252
[[targets]]
220-
os = "linux"
221253
arch = "arm64"
254+
os = "linux"

0 commit comments

Comments
 (0)