From 7ba34dc07eaf34b73a10e9eeae738f0a03cdb5e5 Mon Sep 17 00:00:00 2001
From: Tim Orling <tim.orling@konsulko.com>
Date: Sat, 23 Apr 2022 12:21:03 -0700
Subject: [PATCH] Ubuntu: drop 16.04

Although ubuntu-16.04 is in Extended Security Maintenance until 2026, it
is holding us back from adding git-lfs (see
https://github.com/crops/yocto-dockerfiles/pull/40)

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 .github/workflows/build-test-deploy.yml       |  1 -
 .../ubuntu-16.04/ubuntu-16.04-base/Dockerfile | 61 -------------------
 2 files changed, 62 deletions(-)
 delete mode 100644 dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-base/Dockerfile

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 8c96a56..3850e36 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -27,7 +27,6 @@ jobs:
           fedora-34,
           fedora-35,
           opensuse-15.2,
-          ubuntu-16.04,
           ubuntu-18.04,
           ubuntu-20.04,
           ubuntu-22.04
diff --git a/dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-base/Dockerfile b/dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-base/Dockerfile
deleted file mode 100644
index 57872dc..0000000
--- a/dockerfiles/ubuntu/ubuntu-16.04/ubuntu-16.04-base/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-# ubuntu-16.04-base
-# Copyright (C) 2015-2021 Intel Corporation
-#
-# SPDX-License-Identifier: GPL-2.0-only
-#
-
-FROM ubuntu:16.04
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        gawk \
-        wget \
-        git-core \
-        subversion \
-        diffstat \
-        unzip \
-        sysstat \
-        texinfo \
-        build-essential \
-        chrpath \
-        socat \
-        python \
-        python3 \
-        xz-utils  \
-        locales \
-        cpio \
-        screen \
-        tmux \
-        sudo \
-        iputils-ping \
-        fluxbox \
-        tightvncserver \
-        liblz4-tool \
-        zstd && \
-    cp -af /etc/skel/ /etc/vncskel/ && \
-    echo "export DISPLAY=1" >>/etc/vncskel/.bashrc && \
-    mkdir  /etc/vncskel/.vnc && \
-    echo "" | vncpasswd -f > /etc/vncskel/.vnc/passwd && \
-    chmod 0600 /etc/vncskel/.vnc/passwd && \
-    useradd -U -m yoctouser && \
-    /usr/sbin/locale-gen en_US.UTF-8 && \
-    echo 'dash dash/sh boolean false' | debconf-set-selections && \
-    DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-
-# The versions of gcc, tar and other tools found in Ubuntu 16.04 are now too
-# old to build recent Yocto Project releases. Install the buildtools tarball to
-# provide the required tools.
-COPY install-buildtools.sh /
-RUN bash /install-buildtools.sh && \
-    rm /install-buildtools.sh
-
-COPY build-install-dumb-init.sh install-multilib.sh /
-RUN  bash /build-install-dumb-init.sh && \
-     rm /build-install-dumb-init.sh && \
-     bash /install-multilib.sh && \
-     rm /install-multilib.sh && \
-     apt-get clean
-
-USER yoctouser
-WORKDIR /home/yoctouser
-CMD /bin/bash