From: Zack Cerza <zack@redhat.com>
Date: Fri, 4 Feb 2022 00:02:21 +0000 (-0700)
Subject: Dockerfile-testnode: Switch to Ubuntu
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5dc853e8f0489c79d5a49d460e878d6aaf371220;p=teuthology.git

Dockerfile-testnode: Switch to Ubuntu

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/docs/docker-compose/Dockerfile-testnode b/docs/docker-compose/Dockerfile-testnode
index c83e7517d7..929901b08c 100644
--- a/docs/docker-compose/Dockerfile-testnode
+++ b/docs/docker-compose/Dockerfile-testnode
@@ -1,23 +1,20 @@
-FROM fedora:35
-RUN dnf -y update && \
-    dnf -y install \
+FROM ubuntu:latest
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt update && \
+    apt -y install \
+        sudo \
         openssh-server \
         hostname \
         curl \
-        python3-pip \
-        python3-libselinux \
-        redhat-lsb-core && \
-    dnf clean all
+        python3-pip && \
+    apt clean all
 COPY testnode.sh /
 COPY testnode_sudoers /etc/sudoers.d/teuthology
 RUN \
     ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' && \
-    ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' && \
-    ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key && \
     sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config && \
     mkdir -p /root/.ssh && \
     chmod 700 /root/.ssh && \
-    groupadd sudo && \
     useradd -g sudo ubuntu && \
     mkdir -p /home/ubuntu/.ssh && \
     chmod 700 /home/ubuntu/.ssh && \