From 1fa715aa0a5241cb5b272ca96d6a274130246ba7 Mon Sep 17 00:00:00 2001
From: Dmitry Myaskovskiy <dmitry@enapter.com>
Date: Mon, 13 May 2024 14:46:49 +0200
Subject: [PATCH] Update base image to ubuntu:22.04

---
 .github/workflows/publish.yaml |  2 --
 Dockerfile                     | 27 +++++++++------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 0e381c1..7b090e3 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -10,8 +10,6 @@ on:
     branches:
       - 'master'
 
-env:
-  TEST_TAG: enapter/rockamalg:latest
 jobs:
   docker:
     runs-on: ubuntu-latest
diff --git a/Dockerfile b/Dockerfile
index db64cd1..00f284e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,21 @@
 #
-# Docker image to build Yocto 4.2
+# Docker image to build Yocto 5.0
 #
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # Keep the dependency list as short as reasonable
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y bc bison bsdmainutils build-essential curl locales \
-        flex g++-multilib gcc-multilib git gnupg gperf lib32ncurses-dev \
-        lib32z1-dev libncurses5-dev git-lfs \
-        libsdl1.2-dev libxml2-utils lzop \
-        openjdk-8-jdk lzop wget unzip \
-        genisoimage sudo socat xterm gawk cpio texinfo \
-        gettext vim diffstat chrpath \
-        python-mako libusb-1.0-0-dev exuberant-ctags \
-        pngcrush schedtool xsltproc zip zlib1g-dev libswitch-perl \
-        screen rsync jq python3-pip docker.io parted liblz4-tool zstd \
-        mtools && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        gawk wget git diffstat unzip texinfo gcc build-essential chrpath \
+        socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \
+        iputils-ping python3-git python3-jinja2 python3-subunit zstd \
+        liblz4-tool file locales libacl1 bc bison curl flex gnupg gperf \
+        lzop wget unzip sudo socat gettext zip screen rsync jq parted liblz4-tool \
+        zstd mtools && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN pip3 install yq
 
-ADD https://commondatastorage.googleapis.com/git-repo-downloads/repo /usr/local/bin/
-RUN chmod 755 /usr/local/bin/*
-
 RUN groupadd --gid 1000 build && \
     useradd --uid 1000 --gid 1000 --create-home build && \
     echo "build ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/build && \
@@ -40,7 +33,5 @@ ENV TMPDIR /home/build/tmp
 ENV HOME /home/build
 ENV USER build
 
-ENV PATH="$PATH:/home/build/.local/bin"
-
 USER build
 WORKDIR /home/build