Skip to content

Commit 11ff344

Browse files
committed
remove EOL focal
1 parent 51d11db commit 11ff344

File tree

5 files changed

+5
-55
lines changed

5 files changed

+5
-55
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ control file. For example:
3131

3232
```bash
3333
./make-new-image \
34-
--codename focal \
35-
../python3.6/debian/control > dockerfiles/Dockerfile.focal
34+
--codename noble \
35+
../python3.13/debian/control > dockerfiles/Dockerfile.noble
3636
```

dockerfiles/Dockerfile.focal

Lines changed: 0 additions & 47 deletions
This file was deleted.

dockerfiles/Dockerfile.tools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# we use the oldest supported distribution for pristine-tar
2-
FROM ubuntu:focal
2+
FROM ubuntu:jammy
33
RUN : \
44
&& apt-get update -qq \
55
&& DEBIAN_FRONTEND=noninteractive apt-get install \

make-new-image

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ALWAYS_DEPS = {
4444

4545
def main() -> int:
4646
parser = argparse.ArgumentParser()
47-
parser.add_argument('--codename', default='focal')
47+
parser.add_argument('--codename', required=True)
4848
parser.add_argument('control_filename')
4949
args = parser.parse_args()
5050

quick-test

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ if {lt312}; then
3333
fi
3434
3535
apt-get install -y --no-install-recommends ca-certificates
36-
if [ \
37-
"$DISTRIB_CODENAME" = focal -a {ver} = '3.9' -o \
38-
"$DISTRIB_CODENAME" = jammy -a {ver} = '3.11' \
39-
]; then
36+
if [ "$DISTRIB_CODENAME" = jammy -a {ver} = '3.11' ]; then
4037
apt-get install -y --no-install-recommends python3-distutils
4138
else
4239
if {lt313}; then

0 commit comments

Comments
 (0)