From 8bb65aa0269aa2ec1988605ea3c72d5ea1f6ee42 Mon Sep 17 00:00:00 2001 From: Aphyr Date: Tue, 5 Jan 2021 17:05:24 -0500 Subject: [PATCH] Docker: remove old ubuntu setup This was probably confusing more users than it actually helped: almost none of these tests run on ubuntu, it didn't set up a control node, it looks to be symmetric with the debian docker-compose system but isn't, and we keep getting users stuck trying to run debian-only tests on ubuntu and opening tickets when it doesn't work. --- docker/docker-compose.ubuntu.yml | 12 ------------ docker/node/Dockerfile-ubuntu | 10 ---------- 2 files changed, 22 deletions(-) delete mode 100644 docker/docker-compose.ubuntu.yml delete mode 100644 docker/node/Dockerfile-ubuntu diff --git a/docker/docker-compose.ubuntu.yml b/docker/docker-compose.ubuntu.yml deleted file mode 100644 index 33ff0405..00000000 --- a/docker/docker-compose.ubuntu.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: '3.7' -x-ubuntu: - &ubuntu - build: - dockerfile: Dockerfile-ubuntu - -services: - n1: *ubuntu - n2: *ubuntu - n3: *ubuntu - n4: *ubuntu - n5: *ubuntu diff --git a/docker/node/Dockerfile-ubuntu b/docker/node/Dockerfile-ubuntu deleted file mode 100644 index 9a054309..00000000 --- a/docker/node/Dockerfile-ubuntu +++ /dev/null @@ -1,10 +0,0 @@ -FROM jacobmbr/ubuntu-jepsen:v0.1.0 - -RUN rm /etc/apt/apt.conf.d/docker-clean && apt-get update - -# Install Jepsen dependencies -RUN apt-get install -y openssh-server \ - curl faketime iproute2 iptables iputils-ping libzip4 \ - logrotate man man-db net-tools ntpdate psmisc python rsyslog \ - sudo unzip vim wget apt-transport-https \ - && apt-get remove -y --purge --auto-remove systemd