18 changed files with 83 additions and 157 deletions
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@ -14,7 +14,6 @@ on:
      - ".github/workflows/macos.yml"
      - ".github/workflows/debian-cache.yml"
      - "docs/**"
-      - 'tools/**'
      - ".readthedocs.yaml"
      - "README.md"

--- a/.github/workflows/images-centos.yml
+++ b/.github/workflows/images-centos.yml
@ -1,87 +0,0 @@
-name: CentOS images
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - 'tools/qemu-centos-img/**'
-      - '.github/workflows/images-centos.yml'
-
-concurrency:
-  group: ${{ github.workflow_ref }}
-  cancel-in-progress: true
-
-jobs:
-  images-centos:
-    name: Qemu Images
-    runs-on: ubuntu-latest
-    steps:
-    - uses: digitalocean/action-doctl@v2
-      with:
-        token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-
-    - uses: webfactory/ssh-agent@v0.8.0
-      with:
-        ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-    - name: create droplet
-      run: doctl compute droplet create --ssh-keys='b4:4c:66:7d:be:19:25:43:1c:e0:02:61:9f:49:12:94,37:46:77:a8:4a:96:3b:20:16:46:35:04:95:ca:0c:5c' --tag-name=github-actions ga-out-of-tree-images-centos-$GITHUB_SHA --size s-1vcpu-1gb --image ubuntu-22-04-x64 --wait
-
-      # TODO Move to common script
-    - name: generate images
-      shell: bash
-      run: |
-        sleep 1m
-
-        IP=$(doctl compute droplet list --tag-name=github-actions --format "Name,Public IPv4" | grep -v ID | grep ga-out-of-tree-images-centos-$GITHUB_SHA | awk '{print $2}')
-
-        while ! ssh -o StrictHostKeyChecking=accept-new root@$IP echo
-        do
-          sleep 1s
-        done
-
-        ssh root@$IP "cloud-init status --wait | grep done"
-
-        ssh root@$IP apt-get update
-        ssh root@$IP apt-get install -y git podman s3cmd
-        ssh root@$IP git clone https://github.com/out-of-tree/out-of-tree
-        ssh root@$IP "cd out-of-tree && git checkout $GITHUB_SHA"
-
-        ssh root@$IP "echo -e '[Unit]\nDescription=CentOS image generator and uploader\n[Service]\nRemainAfterExit=yes\nStandardError=append:/var/log/images-centos.log\nStandardOutput=append:/var/log/images-centos.log\nType=oneshot' >> /etc/systemd/system/images-centos.service"
-
-        ssh root@$IP "echo Environment=HOST=fra1.digitaloceanspaces.com >> /etc/systemd/system/images-centos.service"
-        ssh root@$IP "echo Environment=HOST_BUCKET=out-of-tree.fra1.digitaloceanspaces.com >> /etc/systemd/system/images-centos.service"
-        ssh root@$IP "echo Environment=ACCESS_KEY=${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }} >> /etc/systemd/system/images-centos.service"
-        ssh root@$IP "echo Environment=SECRET_KEY=${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }} >> /etc/systemd/system/images-centos.service"
-
-        ssh root@$IP "echo 'ExecStart=/root/out-of-tree/tools/qemu-centos-img/6/generate.sh' >> /etc/systemd/system/images-centos.service"
-        ssh root@$IP "echo 'ExecStart=/root/out-of-tree/tools/qemu-centos-img/7/generate.sh' >> /etc/systemd/system/images-centos.service"
-        ssh root@$IP "echo 'ExecStart=/root/out-of-tree/tools/qemu-centos-img/8/generate.sh' >> /etc/systemd/system/images-centos.service"
-
-        ssh root@$IP 'echo ExecStart=/bin/sh -c \"s3cmd put --acl-public /root/out-of-tree/tools/qemu-centos-img/*/*.tar.gz s3://out-of-tree/3.0.0/ --host=\$HOST --host-bucket=\$HOST_BUCKET --access_key=\$ACCESS_KEY --secret_key=\$SECRET_KEY\" >> /etc/systemd/system/images-centos.service'
-
-        ssh root@$IP "echo TimeoutStopSec=1 >> /etc/systemd/system/images-centos.service"
-
-        ssh root@$IP systemctl daemon-reload
-
-        ssh root@$IP systemctl start images-centos --no-block
-
-        while ! ssh root@$IP systemctl show images-centos -p SubState --value | grep -E '(failed|exited)'
-        do
-          sleep 3m
-        done
-
-        scp root@$IP:/var/log/images-centos.log .
-
-        ssh root@$IP systemctl is-active images-centos
-
-    - name: Archive logs
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: images-centos-log
-        path: images-centos.log
-
-    - name: delete droplet
-      if: always()
-      run: doctl compute droplet delete -f ga-out-of-tree-images-centos-$GITHUB_SHA
--- a/.github/workflows/images-debian.yml
+++ b/.github/workflows/images-debian.yml
@ -1,4 +1,4 @@
-name: Debian images
+name: Debian

 on:
  workflow_dispatch:
@ -25,7 +25,7 @@ jobs:
        ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

    - name: create droplet
-      run: doctl compute droplet create --ssh-keys='b4:4c:66:7d:be:19:25:43:1c:e0:02:61:9f:49:12:94,37:46:77:a8:4a:96:3b:20:16:46:35:04:95:ca:0c:5c' --tag-name=github-actions ga-out-of-tree-images-debian-$GITHUB_SHA --size s-1vcpu-1gb --image ubuntu-22-04-x64 --wait
+      run: doctl compute droplet create --ssh-keys='b4:4c:66:7d:be:19:25:43:1c:e0:02:61:9f:49:12:94' --tag-name=github-actions ga-out-of-tree-images-debian-$GITHUB_SHA --size s-1vcpu-1gb --image ubuntu-22-04-x64 --wait

      # TODO Move to common script
    - name: generate images
@ -40,7 +40,8 @@ jobs:
          sleep 1s
        done

-        ssh root@$IP "cloud-init status --wait | grep done"
+        sleep 5m
+        ssh root@$IP pkill apt-get || true

        ssh root@$IP apt-get update
        ssh root@$IP apt-get install -y git podman s3cmd
@ -56,7 +57,7 @@ jobs:

        ssh root@$IP "echo 'ExecStart=/root/out-of-tree/tools/qemu-debian-img/generate-images.sh' >> /etc/systemd/system/images-debian.service"

-        ssh root@$IP 'echo ExecStart=/bin/sh -c \"s3cmd put --acl-public /root/out-of-tree/tools/qemu-debian-img/*.tar.gz s3://out-of-tree/3.0.0/ --host=\$HOST --host-bucket=\$HOST_BUCKET --access_key=\$ACCESS_KEY --secret_key=\$SECRET_KEY\" >> /etc/systemd/system/images-debian.service'
+        ssh root@$IP 'echo ExecStart=/bin/sh -c \"s3cmd put --acl-public /root/out-of-tree/tools/qemu-debian-img/*.tar.gz s3://out-of-tree/1.0.0/ --host=\$HOST --host-bucket=\$HOST_BUCKET --access_key=\$ACCESS_KEY --secret_key=\$SECRET_KEY\" >> /etc/systemd/system/images-debian.service'

        ssh root@$IP "echo TimeoutStopSec=1 >> /etc/systemd/system/images-debian.service"

--- a/.github/workflows/images-oraclelinux.yml
+++ b/.github/workflows/images-oraclelinux.yml
@ -1,4 +1,4 @@
-name: Oracle Linux images
+name: Oracle Linux

 on:
  workflow_dispatch:
@ -25,7 +25,7 @@ jobs:
        ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

    - name: create droplet
-      run: doctl compute droplet create --ssh-keys='b4:4c:66:7d:be:19:25:43:1c:e0:02:61:9f:49:12:94,37:46:77:a8:4a:96:3b:20:16:46:35:04:95:ca:0c:5c' --tag-name=github-actions ga-out-of-tree-images-oraclelinux-$GITHUB_SHA --size s-1vcpu-2gb --image ubuntu-22-04-x64 --wait
+      run: doctl compute droplet create --ssh-keys='b4:4c:66:7d:be:19:25:43:1c:e0:02:61:9f:49:12:94' --tag-name=github-actions ga-out-of-tree-images-oraclelinux-$GITHUB_SHA --size s-1vcpu-1gb --image ubuntu-22-04-x64 --wait

      # TODO Move to common script
    - name: generate images
@ -40,7 +40,8 @@ jobs:
          sleep 1s
        done

-        ssh root@$IP "cloud-init status --wait | grep done"
+        sleep 5m
+        ssh root@$IP pkill apt-get || true

        ssh root@$IP apt-get update
        ssh root@$IP apt-get install -y git podman s3cmd
@ -56,7 +57,7 @@ jobs:

        ssh root@$IP "echo 'ExecStart=/root/out-of-tree/tools/qemu-oraclelinux-img/generate-images.sh' >> /etc/systemd/system/images-oraclelinux.service"

-        ssh root@$IP 'echo ExecStart=/bin/sh -c \"s3cmd put --acl-public /root/out-of-tree/tools/qemu-oraclelinux-img/*.tar.gz s3://out-of-tree/3.0.0/ --host=\$HOST --host-bucket=\$HOST_BUCKET --access_key=\$ACCESS_KEY --secret_key=\$SECRET_KEY\" >> /etc/systemd/system/images-oraclelinux.service'
+        ssh root@$IP 'echo ExecStart=/bin/sh -c \"s3cmd put --acl-public /root/out-of-tree/tools/qemu-oraclelinux-img/*.tar.gz s3://out-of-tree/1.0.0/ --host=\$HOST --host-bucket=\$HOST_BUCKET --access_key=\$ACCESS_KEY --secret_key=\$SECRET_KEY\" >> /etc/systemd/system/images-oraclelinux.service'

        ssh root@$IP "echo TimeoutStopSec=1 >> /etc/systemd/system/images-oraclelinux.service"

@ -73,13 +74,6 @@ jobs:

        ssh root@$IP systemctl is-active images-oraclelinux

-    - name: Archive logs
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: images-oraclelinux-log
-        path: images-oraclelinux.log
-
    - name: delete droplet
      if: always()
      run: doctl compute droplet delete -f ga-out-of-tree-images-oraclelinux-$GITHUB_SHA
--- a/.github/workflows/images-ubuntu.yml
+++ b/.github/workflows/images-ubuntu.yml
@ -58,7 +58,7 @@ jobs:

        ssh root@$IP "echo 'ExecStart=/root/out-of-tree/tools/qemu-ubuntu-img/generate-images.py' >> /etc/systemd/system/images-ubuntu.service"

-        ssh root@$IP 'echo ExecStart=/bin/sh -c \"s3cmd put --acl-public /root/out-of-tree/tools/qemu-ubuntu-img/*.tar.gz s3://out-of-tree/3.0.0/ --host=\$HOST --host-bucket=\$HOST_BUCKET --access_key=\$ACCESS_KEY --secret_key=\$SECRET_KEY\" >> /etc/systemd/system/images-ubuntu.service'
+        ssh root@$IP 'echo ExecStart=/bin/sh -c \"s3cmd put --acl-public /root/out-of-tree/tools/qemu-ubuntu-img/*.tar.gz s3://out-of-tree/1.0.0/ --host=\$HOST --host-bucket=\$HOST_BUCKET --access_key=\$ACCESS_KEY --secret_key=\$SECRET_KEY\" >> /etc/systemd/system/images-ubuntu.service'

        ssh root@$IP "echo TimeoutStopSec=1 >> /etc/systemd/system/images-ubuntu.service"

--- a/tools/qemu-centos-img/6/Dockerfile
+++ b/tools/qemu-centos-img/6/Dockerfile
@ -28,8 +28,6 @@ RUN sed -i '/PermitEmptyPasswords/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitEmptyPasswords yes >> $TMPDIR/etc/ssh/sshd_config
 RUN sed -i '/PermitRootLogin/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitRootLogin yes >> $TMPDIR/etc/ssh/sshd_config
-RUN sed -i '/UseDNS/d' $TMPDIR/etc/ssh/sshd_config
-RUN echo UseDNS no >> $TMPDIR/etc/ssh/sshd_config

 # network workaround
 RUN chmod +x $TMPDIR/etc/rc.local
--- a/tools/qemu-centos-img/6/generate.sh
+++ b/tools/qemu-centos-img/6/generate.sh
@ -4,6 +4,6 @@ set -eux

 cd "$(dirname "$0")"

-sudo podman build -t gen-centos6-image .
-sudo podman run --privileged -v $(pwd):/shared -t gen-centos6-image
+sudo docker build -t gen-centos6-image .
+sudo docker run --privileged -v $(pwd):/shared -t gen-centos6-image
 tar -Szcf out_of_tree_centos_6.img.tar.gz out_of_tree_centos_6.img
--- a/tools/qemu-centos-img/7/Dockerfile
+++ b/tools/qemu-centos-img/7/Dockerfile
@ -13,11 +13,6 @@
 #
 FROM centos:7

-RUN sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/* || true
-RUN sed -i 's/name/enabled=0\nname/' /etc/yum.repos.d/* || true
-RUN echo -e '[7.9.2009-os]\nbaseurl=https://vault.centos.org/7.9.2009/os/$basearch/\ngpgcheck=0' >> /etc/yum.repos.d/oot.repo
-RUN echo -e '[7.9.2009-updates]\nbaseurl=https://vault.centos.org/7.9.2009/updates/$basearch/\ngpgcheck=0' >> /etc/yum.repos.d/oot.repo
-
 RUN yum -y update
 RUN yum -y groupinstall "Development Tools"
 RUN yum -y install qemu-img e2fsprogs
@ -26,13 +21,13 @@ ENV TMPDIR=/tmp/centos

 RUN yum --installroot=$TMPDIR \
        --releasever=7 \
+        --disablerepo='*' \
+        --enablerepo=base \
        -y groupinstall Base
-
-RUN rm $TMPDIR/etc/yum.repos.d/*
-RUN cp /etc/yum.repos.d/* $TMPDIR/etc/yum.repos.d/
-
 RUN yum --installroot=$TMPDIR \
        --releasever=7 \
+        --disablerepo='*' \
+        --enablerepo=base \
        -y install openssh-server openssh-clients

 RUN chroot $TMPDIR /bin/sh -c 'useradd -m user'
@ -42,8 +37,6 @@ RUN sed -i '/PermitEmptyPasswords/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitEmptyPasswords yes >> $TMPDIR/etc/ssh/sshd_config
 RUN sed -i '/PermitRootLogin/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitRootLogin yes >> $TMPDIR/etc/ssh/sshd_config
-RUN sed -i '/UseDNS/d' $TMPDIR/etc/ssh/sshd_config
-RUN echo UseDNS no >> $TMPDIR/etc/ssh/sshd_config

 # network workaround
 RUN chmod +x $TMPDIR/etc/rc.local
--- a/tools/qemu-centos-img/7/generate.sh
+++ b/tools/qemu-centos-img/7/generate.sh
@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -eux
-
-cd "$(dirname "$0")"
-
-sudo podman build -t gen-centos7-image .
-sudo podman run --privileged -v $(pwd):/shared -t gen-centos7-image
-tar -Szcf out_of_tree_centos_7.img.tar.gz out_of_tree_centos_7.img
--- a/tools/qemu-centos-img/8/Dockerfile
+++ b/tools/qemu-centos-img/8/Dockerfile
@ -28,8 +28,6 @@ RUN sed -i '/PermitEmptyPasswords/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitEmptyPasswords yes >> $TMPDIR/etc/ssh/sshd_config
 RUN sed -i '/PermitRootLogin/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitRootLogin yes >> $TMPDIR/etc/ssh/sshd_config
-RUN sed -i '/UseDNS/d' $TMPDIR/etc/ssh/sshd_config
-RUN echo UseDNS no >> $TMPDIR/etc/ssh/sshd_config

 # network workaround
 RUN chmod +x $TMPDIR/etc/rc.local
--- a/tools/qemu-centos-img/8/generate.sh
+++ b/tools/qemu-centos-img/8/generate.sh
@ -4,6 +4,6 @@ set -eux

 cd "$(dirname "$0")"

-sudo podman build -t gen-centos8-image .
-sudo podman run --privileged -v $(pwd):/shared -t gen-centos8-image
+sudo docker build -t gen-centos8-image .
+sudo docker run --privileged -v $(pwd):/shared -t gen-centos8-image
 tar -Szcf out_of_tree_centos_8.img.tar.gz out_of_tree_centos_8.img
--- a/tools/qemu-debian-img/setup.sh
+++ b/tools/qemu-debian-img/setup.sh
@ -11,8 +11,6 @@ sed -i '/PermitEmptyPasswords/d' $TMPDIR/etc/ssh/sshd_config
 echo PermitEmptyPasswords yes >> $TMPDIR/etc/ssh/sshd_config
 sed -i '/PermitRootLogin/d' $TMPDIR/etc/ssh/sshd_config
 echo PermitRootLogin yes >> $TMPDIR/etc/ssh/sshd_config
-sed -i '/UseDNS/d' $TMPDIR/etc/ssh/sshd_config
-echo UseDNS no >> $TMPDIR/etc/ssh/sshd_config

 echo '#!/bin/sh' > $TMPDIR/etc/rc.local
 echo 'dhclient' >> $TMPDIR/etc/rc.local
--- a/tools/qemu-oraclelinux-img/Dockerfile.template
+++ b/tools/qemu-oraclelinux-img/Dockerfile.template
@ -13,7 +13,6 @@ RUN yum --installroot=$TMPDIR \
        --releasever=_VERSION_ \
        --disablerepo='*' \
        --enablerepo=ol_VERSION__baseos_latest \
-        --enablerepo=ol_VERSION__appstream \
        -y groupinstall Base

 RUN cp /etc/yum.repos.d/* $TMPDIR/etc/yum.repos.d/
@ -22,7 +21,6 @@ RUN yum --installroot=$TMPDIR \
        --releasever=_VERSION_ \
        --disablerepo='*' \
        --enablerepo=ol_VERSION__baseos_latest \
-        --enablerepo=ol_VERSION__appstream \
        -y install openssh-server openssh-clients dhclient yum

 RUN chroot $TMPDIR /bin/sh -c 'useradd -m user'
@ -32,8 +30,6 @@ RUN sed -i '/PermitEmptyPasswords/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitEmptyPasswords yes >> $TMPDIR/etc/ssh/sshd_config
 RUN sed -i '/PermitRootLogin/d' $TMPDIR/etc/ssh/sshd_config
 RUN echo PermitRootLogin yes >> $TMPDIR/etc/ssh/sshd_config
-RUN sed -i '/UseDNS/d' $TMPDIR/etc/ssh/sshd_config
-RUN echo UseDNS no >> $TMPDIR/etc/ssh/sshd_config

 # network workaround
 RUN chmod +x $TMPDIR/etc/rc.local
--- a/tools/qemu-oraclelinux-img/generate-images.sh
+++ b/tools/qemu-oraclelinux-img/generate-images.sh
@ -11,11 +11,9 @@ for version in 6 7 8 9; do

    if [[ $version -eq 6 ]]; then
 	sed -i 's/baseos_latest/u10_base/' $version/Dockerfile
-	sed -i '/appstream/d' $version/Dockerfile
    fi
    if [[ $version -eq 7 ]]; then
 	sed -i 's/baseos_latest/u9_base/' $version/Dockerfile
-	sed -i '/appstream/d' $version/Dockerfile
    fi

    podman build -t gen-oraclelinux${version}-image $version
--- a/tools/qemu-ubuntu-img/14.04/Dockerfile
+++ b/tools/qemu-ubuntu-img/14.04/Dockerfile
@ -0,0 +1,35 @@
+# Copyright 2018 Mikhail Klementev. All rights reserved.
+# Use of this source code is governed by a AGPLv3 license
+# (or later) that can be found in the LICENSE file.
+#
+# Usage:
+#
+#     $ docker build -t gen-ubuntu1404-image .
+#     $ docker run --privileged -v $(pwd):/shared -t gen-ubuntu1404-image
+#
+# ubuntu1404.img will be created in current directory. You can change $(pwd) to
+# different directory to use different destination for image.
+#
+FROM ubuntu:14.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update
+RUN apt-get install -y debootstrap qemu
+
+ENV TMPDIR=/tmp/ubuntu
+ENV IMAGEDIR=/tmp/image
+ENV IMAGE=/shared/out_of_tree_ubuntu_14__04.img
+ENV REPOSITORY=http://archive.ubuntu.com/ubuntu
+ENV RELEASE=trusty
+
+RUN mkdir $IMAGEDIR
+
+# Must be executed with --privileged because of /dev/loop
+CMD debootstrap --include=openssh-server,policykit-1 \
+	$RELEASE $TMPDIR $REPOSITORY && \
+	/shared/setup.sh $TMPDIR && \
+	qemu-img create $IMAGE 2G && \
+	mkfs.ext4 -F $IMAGE && \
+	mount -o loop $IMAGE $IMAGEDIR && \
+	cp -a $TMPDIR/* $IMAGEDIR/ && \
+	umount $IMAGEDIR
--- a/tools/qemu-ubuntu-img/14.04/setup.sh
+++ b/tools/qemu-ubuntu-img/14.04/setup.sh
@ -0,0 +1,17 @@
+#!/bin/sh -eux
+# Copyright 2018 Mikhail Klementev. All rights reserved.
+# Use of this source code is governed by a AGPLv3 license
+# (or later) that can be found in the LICENSE file.
+TMPDIR=$1
+chroot $TMPDIR /bin/sh -c 'useradd -m user'
+sed -i 's/root:\*:/root::/' $TMPDIR/etc/shadow
+sed -i 's/user:!!:/user::/' $TMPDIR/etc/shadow
+echo auth sufficient pam_permit.so > $TMPDIR/etc/pam.d/sshd
+sed -i '/PermitEmptyPasswords/d' $TMPDIR/etc/ssh/sshd_config
+echo PermitEmptyPasswords yes >> $TMPDIR/etc/ssh/sshd_config
+sed -i '/PermitRootLogin/d' $TMPDIR/etc/ssh/sshd_config
+echo PermitRootLogin yes >> $TMPDIR/etc/ssh/sshd_config
+
+echo '#!/bin/sh' > $TMPDIR/etc/rc.local
+echo 'dhclient eth0' >> $TMPDIR/etc/rc.local
+chmod +x $TMPDIR/etc/rc.local
--- a/tools/qemu-ubuntu-img/generate-images.py
+++ b/tools/qemu-ubuntu-img/generate-images.py
@ -7,29 +7,27 @@ script_dir = os.path.dirname(os.path.realpath(__file__))
 os.chdir(script_dir)

 releases = [
-    ('12.04', 'precise', 'http://old-releases.ubuntu.com/ubuntu'),
-    ('14.04', 'trusty', 'http://archive.ubuntu.com/ubuntu'),
-    ('16.04', 'xenial', 'http://archive.ubuntu.com/ubuntu'),
-    ('18.04', 'bionic', 'http://archive.ubuntu.com/ubuntu'),
-    ('20.04', 'focal', 'http://archive.ubuntu.com/ubuntu'),
-    ('22.04', 'jammy', 'http://archive.ubuntu.com/ubuntu'),
-    ('24.04', 'noble', 'http://archive.ubuntu.com/ubuntu')
+    # ('12.04', 'precies'),
+    # ('14.04', 'trusty'),
+    # ('16.04', 'xenial'),
+    # ('18.04', 'bionic'),
+    # ('20.04', 'focal'),
+    # ('22.04', 'jammy'),
+    ('24.04', 'noble'),
 ]

 template = '''
 FROM ubuntu:{version}

-RUN sed -i 's;http://archive.ubuntu.com/ubuntu;{repository};' /etc/apt/sources.list
-
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update
-RUN apt-get install -y debootstrap qemu-utils
-RUN apt-get install -y linux-image-generic
+RUN apt update
+RUN apt install -y debootstrap qemu-utils
+RUN apt install -y linux-image-generic

 ENV TMPDIR=/tmp/ubuntu
 ENV IMAGEDIR=/tmp/image
 ENV IMAGE=/shared/out_of_tree_ubuntu_{img_version}.img
-ENV REPOSITORY={repository}
+ENV REPOSITORY=http://archive.ubuntu.com/ubuntu
 ENV RELEASE={codename}

 RUN mkdir $IMAGEDIR
@ -49,7 +47,7 @@ def run_cmd(cmd):
    print(f"+ {cmd}")
    subprocess.run(cmd, shell=True, check=True, executable='/bin/bash')

-for version, codename, repository in releases:
+for version, codename in releases:
    numeric_version = version.replace('.', '')
    img_version=version.replace(".","__")

@ -57,7 +55,6 @@ for version, codename, repository in releases:
        version=version,
        img_version=img_version,
        codename=codename,
-        repository=repository,
        numeric_version=numeric_version)

    os.makedirs(str(version), exist_ok=True)
--- a/tools/qemu-ubuntu-img/setup.sh
+++ b/tools/qemu-ubuntu-img/setup.sh
@ -11,8 +11,6 @@ sed -i '/PermitEmptyPasswords/d' $TMPDIR/etc/ssh/sshd_config
 echo PermitEmptyPasswords yes >> $TMPDIR/etc/ssh/sshd_config
 sed -i '/PermitRootLogin/d' $TMPDIR/etc/ssh/sshd_config
 echo PermitRootLogin yes >> $TMPDIR/etc/ssh/sshd_config
-sed -i '/UseDNS/d' $TMPDIR/etc/ssh/sshd_config
-echo UseDNS no >> $TMPDIR/etc/ssh/sshd_config

 echo '#!/bin/sh' > $TMPDIR/etc/rc.local
 echo 'dhclient || dhcpcd' >> $TMPDIR/etc/rc.local