File tree Expand file tree Collapse file tree 4 files changed +15
-38
lines changed Expand file tree Collapse file tree 4 files changed +15
-38
lines changed Original file line number Diff line number Diff line change @@ -81,13 +81,8 @@ ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
81
81
ENV MONGO_MAJOR {{ if env.version != env.rcVersion then "testing" else env.version end }}
82
82
RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/{{ target.image | gsub(":.*$"; "") }} {{ target.suite }}/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR {{ if target.image | test("^debian") then "main" else "multiverse" end }}" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
83
83
{{ if env.version != env.rcVersion then ( -}}
84
- {{ if .dockerNeedsVersion then ( -}}
85
- # {{ env.rcVersion }} is not GA, so we need the previous release for mongodb-mongosh and mongodb-database-tools
86
- RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/{{ target.image | gsub(":.*$"; "") }} {{ target.suite }}/${MONGO_PACKAGE%-unstable}/{{ .dockerNeedsVersion }} {{ if target.image | test("^debian") then "main" else "multiverse" end }}" | tee "/etc/apt/sources.list.d/mongodb-previous.list"
87
- {{ ) else ( -}}
88
84
# add GA repo for mongodb-mongosh and mongodb-database-tools
89
85
RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/{{ target.image | gsub(":.*$"; "") }} {{ target.suite }}/${MONGO_PACKAGE%-unstable}/{{ env.rcVersion }} {{ if target.image | test("^debian") then "main" else "multiverse" end }}" | tee "/etc/apt/sources.list.d/mongodb-{{ env.rcVersion }}.list"
90
- {{ ) end -}}
91
86
{{ ) else "" end -}}
92
87
93
88
{{ if .notes then ( -}}
Original file line number Diff line number Diff line change 268
268
"8.0-rc" : {
269
269
"changes" : " https://jira.mongodb.org/issues/?jql=project%20%3D%20SERVER%20AND%20fixVersion%20%3D%20%228.0.0-rc16%22%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC" ,
270
270
"date" : " 08/03/2024" ,
271
- "dockerNeedsVersion" : " 7.0" ,
272
271
"githash" : " c05b57203089bb276c31ab34dfc538f1da972a36" ,
273
- "linux" : " ubuntu2204 " ,
272
+ "linux" : " ubuntu2404 " ,
274
273
"notes" : " https://docs.mongodb.org/master/release-notes/8.0/" ,
275
274
"pgp" : [
276
275
{
279
278
],
280
279
"url" : " https://pgp.mongodb.com/server-dev.asc"
281
280
},
282
- {
283
- "fingerprints" : [
284
- " E58830201F7DD82CD808AA84160D26BB1785BA38"
285
- ],
286
- "url" : " https://pgp.mongodb.com/server-7.0.asc"
287
- },
288
281
{
289
282
"fingerprints" : [
290
283
" 4B0752C1BCA238C0B4EE14DC41DE058A4E7DCA05"
316
309
"image" : " ubuntu:jammy" ,
317
310
"suite" : " jammy"
318
311
},
312
+ "ubuntu2404" : {
313
+ "arches" : [
314
+ " amd64" ,
315
+ " arm64v8"
316
+ ],
317
+ "image" : " ubuntu:noble" ,
318
+ "suite" : " noble"
319
+ },
319
320
"windows" : {
320
321
"arches" : [
321
322
" amd64"
Original file line number Diff line number Diff line change @@ -62,21 +62,8 @@ shell="$(
62
62
| ($splitVersion[0] | tonumber) >= 5 and ($splitVersion[1] | tonumber) > 0
63
63
| not
64
64
)
65
-
66
- # if a given pre-release version has not had a GA release yet, we need the previous release for mongodb-mongosh and mongodb-database-tools
67
- | (.version | rtrimstr("-rc")) as $rcVersion
68
- | if .version != $rcVersion and (.meta.version | ltrimstr($rcVersion) | startswith(".0-")) then
69
- .meta.dockerNeedsVersion = ($rcVersion | split(".") | .[0] |= (tonumber -1 | tostring) | join("."))
70
- else . end
71
65
]
72
66
73
- # filter the list of "downloads" (targets) down to the set of targets of (M-1).0 if we need that previous version (see "dockerNeedsVersion" above)
74
- | (map({ key: .version, value: [ .meta.downloads[].target ] }) | from_entries) as $targets
75
- | map(if .meta | has("dockerNeedsVersion") then
76
- .meta.dockerNeedsVersion as $needsVersion
77
- | .meta.downloads |= map(select(.target as $target | $targets[$needsVersion] | index($target)))
78
- else . end)
79
-
80
67
# now convert all that data to a basic shell list + map so we can loop over/use it appropriately
81
68
| "allVersions=( " + (
82
69
map(.version | ., if endswith("-rc") then empty else . + "-rc" end)
@@ -138,7 +125,6 @@ for version in "${versions[@]}"; do
138
125
"githash",
139
126
"notes",
140
127
"version",
141
- "dockerNeedsVersion",
142
128
empty
143
129
] | index($key)))
144
130
+ {
@@ -148,11 +134,6 @@ for version in "${versions[@]}"; do
148
134
$pgp.dev
149
135
else empty end,
150
136
151
- if .dockerNeedsVersion then
152
- # see "dockerNeedsVersion" notes above
153
- $pgp[.dockerNeedsVersion]
154
- else empty end,
155
-
156
137
$pgp[$rcVersion],
157
138
158
139
empty
You can’t perform that action at this time.
0 commit comments