Skip to content

Commit d8ad603

Browse files
knutwannhedenknutwannheden
committed
Update FindEndOfLifeImagesTest test expectations
1 parent 8994cfa commit d8ad603

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

‎rewrite-docker/src/test/java/org/openrewrite/docker/search/FindEndOfLifeImagesTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void detectDebianBuster() {
3737
//language=csv
3838
"""
3939
sourceFile,stageName,imageName,tag,eolDate,suggestedReplacement
40-
Dockerfile,,debian,buster,2024-06-30,"bookworm (12) or bullseye (11)"
40+
Dockerfile,,debian,buster,2024-06-30,"trixie (13) or bookworm (12)"
4141
"""
4242
),
4343
Assertions.docker(
@@ -46,7 +46,7 @@ void detectDebianBuster() {
4646
RUN apt-get update
4747
""",
4848
"""
49-
~~(EOL: debian:buster (ended 2024-06-30, suggest bookworm (12) or bullseye (11)))~~>FROM debian:buster
49+
~~(EOL: debian:buster (ended 2024-06-30, suggest trixie (13) or bookworm (12)))~~>FROM debian:buster
5050
RUN apt-get update
5151
"""
5252
)
@@ -60,7 +60,7 @@ void detectDebianBusterSlim() {
6060
//language=csv
6161
"""
6262
sourceFile,stageName,imageName,tag,eolDate,suggestedReplacement
63-
Dockerfile,,debian,buster-slim,2024-06-30,"bookworm (12) or bullseye (11)"
63+
Dockerfile,,debian,buster-slim,2024-06-30,"trixie (13) or bookworm (12)"
6464
"""
6565
),
6666
Assertions.docker(
@@ -69,7 +69,7 @@ void detectDebianBusterSlim() {
6969
RUN apt-get update
7070
""",
7171
"""
72-
~~(EOL: debian:buster-slim (ended 2024-06-30, suggest bookworm (12) or bullseye (11)))~~>FROM debian:buster-slim
72+
~~(EOL: debian:buster-slim (ended 2024-06-30, suggest trixie (13) or bookworm (12)))~~>FROM debian:buster-slim
7373
RUN apt-get update
7474
"""
7575
)
@@ -85,7 +85,7 @@ void detectDebianStretch() {
8585
RUN apt-get update
8686
""",
8787
"""
88-
~~(EOL: debian:stretch (ended 2022-07-01, suggest bookworm (12) or bullseye (11)))~~>FROM debian:stretch
88+
~~(EOL: debian:stretch (ended 2022-07-01, suggest trixie (13) or bookworm (12)))~~>FROM debian:stretch
8989
RUN apt-get update
9090
"""
9191
)
@@ -101,7 +101,7 @@ void detectUbuntuXenial() {
101101
RUN apt-get update
102102
""",
103103
"""
104-
~~(EOL: ubuntu:16.04 (ended 2021-04-30, suggest noble (24.04) or jammy (22.04)))~~>FROM ubuntu:16.04
104+
~~(EOL: ubuntu:16.04 (ended 2021-04-30, suggest noble (24.04)))~~>FROM ubuntu:16.04
105105
RUN apt-get update
106106
"""
107107
)
@@ -117,7 +117,7 @@ void detectUbuntuBionic() {
117117
RUN apt-get update
118118
""",
119119
"""
120-
~~(EOL: ubuntu:bionic (ended 2023-05-31, suggest noble (24.04) or jammy (22.04)))~~>FROM ubuntu:bionic
120+
~~(EOL: ubuntu:bionic (ended 2023-05-31, suggest noble (24.04)))~~>FROM ubuntu:bionic
121121
RUN apt-get update
122122
"""
123123
)
@@ -133,7 +133,7 @@ void detectAlpine3_14() {
133133
RUN apk update
134134
""",
135135
"""
136-
~~(EOL: alpine:3.14 (ended 2023-05-01, suggest 3.21 or 3.20))~~>FROM alpine:3.14
136+
~~(EOL: alpine:3.14 (ended 2023-05-01, suggest 3.23 or 3.22))~~>FROM alpine:3.14
137137
RUN apk update
138138
"""
139139
)
@@ -149,7 +149,7 @@ void detectPython37() {
149149
RUN pip install flask
150150
""",
151151
"""
152-
~~(EOL: python:3.7 (ended 2023-06-27, suggest 3.12 or 3.11))~~>FROM python:3.7
152+
~~(EOL: python:3.7 (ended 2023-06-27, suggest 3.14 or 3.13))~~>FROM python:3.7
153153
RUN pip install flask
154154
"""
155155
)
@@ -165,7 +165,7 @@ void detectPython37Alpine() {
165165
RUN pip install flask
166166
""",
167167
"""
168-
~~(EOL: python:3.7-alpine (ended 2023-06-27, suggest 3.12 or 3.11))~~>FROM python:3.7-alpine
168+
~~(EOL: python:3.7-alpine (ended 2023-06-27, suggest 3.14 or 3.13))~~>FROM python:3.7-alpine
169169
RUN pip install flask
170170
"""
171171
)
@@ -197,7 +197,7 @@ void detectNode16() {
197197
RUN npm install
198198
""",
199199
"""
200-
~~(EOL: node:16 (ended 2024-04-30, suggest 22 or 20))~~>FROM node:16
200+
~~(EOL: node:16 (ended 2024-04-30, suggest 24 or 22))~~>FROM node:16
201201
RUN npm install
202202
"""
203203
)
@@ -221,7 +221,7 @@ void currentUbuntuNotFlagged() {
221221
rewriteRun(
222222
Assertions.docker(
223223
"""
224-
FROM ubuntu:22.04
224+
FROM ubuntu:24.04
225225
RUN apt-get update
226226
"""
227227
)
@@ -296,7 +296,7 @@ void multiStageDetectsAllEol() {
296296
"""
297297
sourceFile,stageName,imageName,tag,eolDate,suggestedReplacement
298298
Dockerfile,builder,node,14,2023-04-30,"22 or 20"
299-
Dockerfile,,debian,buster,2024-06-30,"bookworm (12) or bullseye (11)"
299+
Dockerfile,,debian,buster,2024-06-30,"trixie (13) or bookworm (12)"
300300
"""
301301
),
302302
Assertions.docker(
@@ -311,7 +311,7 @@ void multiStageDetectsAllEol() {
311311
~~(EOL: node:14 (ended 2023-04-30, suggest 22 or 20))~~>FROM node:14 AS builder
312312
RUN npm run build
313313
314-
~~(EOL: debian:buster (ended 2024-06-30, suggest bookworm (12) or bullseye (11)))~~>FROM debian:buster
314+
~~(EOL: debian:buster (ended 2024-06-30, suggest trixie (13) or bookworm (12)))~~>FROM debian:buster
315315
COPY --from=builder /app /app
316316
"""
317317
)
@@ -325,7 +325,7 @@ void mixedEolAndCurrent() {
325325
//language=csv
326326
"""
327327
sourceFile,stageName,imageName,tag,eolDate,suggestedReplacement
328-
Dockerfile,,debian,buster,2024-06-30,"bookworm (12) or bullseye (11)"
328+
Dockerfile,,debian,buster,2024-06-30,"trixie (13) or bookworm (12)"
329329
"""
330330
),
331331
Assertions.docker(
@@ -340,7 +340,7 @@ void mixedEolAndCurrent() {
340340
FROM golang:1.21 AS builder
341341
RUN go build -o app .
342342
343-
~~(EOL: debian:buster (ended 2024-06-30, suggest bookworm (12) or bullseye (11)))~~>FROM debian:buster
343+
~~(EOL: debian:buster (ended 2024-06-30, suggest trixie (13) or bookworm (12)))~~>FROM debian:buster
344344
COPY --from=builder /app /app
345345
"""
346346
)
@@ -368,7 +368,7 @@ void detectDebianByVersionNumber() {
368368
RUN apt-get update
369369
""",
370370
"""
371-
~~(EOL: debian:10 (ended 2024-06-30, suggest bookworm (12) or bullseye (11)))~~>FROM debian:10
371+
~~(EOL: debian:10 (ended 2024-06-30, suggest trixie (13) or bookworm (12)))~~>FROM debian:10
372372
RUN apt-get update
373373
"""
374374
)

0 commit comments

Comments
 (0)
⚡