From 4f8c60de5fb3d65772cb9dbf866e08ee9f82c927 Mon Sep 17 00:00:00 2001
From: Rafael Sene <rafael@riscv.org>
Date: Mon, 22 May 2023 22:39:57 -0300
Subject: [PATCH] Update ubuntu2204

Reduce layers

Signed-off-by: Rafael Sene <rafael@riscv.org>
---
 Dockerfiles/ubuntu2204 | 104 ++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/Dockerfiles/ubuntu2204 b/Dockerfiles/ubuntu2204
index 03cea6b..0c088dc 100644
--- a/Dockerfiles/ubuntu2204
+++ b/Dockerfiles/ubuntu2204
@@ -4,55 +4,55 @@ LABEL maintainer="Rafael Sene rafael@riscv.org"
 
 WORKDIR /build
 
-RUN export DEBIAN_FRONTEND=noninteractive; apt-get update; apt-get install -y \
-bison \
-build-essential \
-python3-pip \
-cmake \
-curl \
-flex \
-fonts-lyx \
-git \
-graphviz \
-default-jre \
-libcairo2-dev \
-libffi-dev \
-libgdk-pixbuf2.0-dev \
-libpango1.0-dev \
-libxml2-dev \
-libglib2.0-dev \
-make \
-pkg-config \
-ruby \
-ruby-dev \
-libgif-dev \
-libwebp-dev \
-libzstd-dev \
-ruby-full \
-gem \
-npm \
-texlive-latex-base \
-texlive-fonts-recommended \
-texlive-fonts-extra \
-texlive-latex-extra \
-texlive-science; \
-pip3 install sympy pyyaml jsonschema
-
-RUN gem install \
-asciidoctor \
-asciidoctor-sail \
-asciidoctor-bibtex \
-asciidoctor-diagram \
-asciidoctor-mathematical \
-asciidoctor-pdf \
-citeproc-ruby \
-coderay \
-csl-styles \
-json \
-pygments.rb \
-rghost \
-rouge \
-ruby_dev
-
-RUN npm install -g wavedrom-cli@2.6.8
-RUN npm install -g bytefield-svg@1.8.0
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && apt-get install -y \
+    bison \
+    build-essential \
+    python3-pip \
+    cmake \
+    curl \
+    flex \
+    fonts-lyx \
+    git \
+    graphviz \
+    default-jre \
+    libcairo2-dev \
+    libffi-dev \
+    libgdk-pixbuf2.0-dev \
+    libpango1.0-dev \
+    libxml2-dev \
+    libglib2.0-dev \
+    make \
+    pkg-config \
+    ruby \
+    ruby-dev \
+    libgif-dev \
+    libwebp-dev \
+    libzstd-dev \
+    ruby-full \
+    gem \
+    npm \
+    texlive-latex-base \
+    texlive-fonts-recommended \
+    texlive-fonts-extra \
+    texlive-latex-extra \
+    texlive-science && \
+    pip3 install sympy pyyaml jsonschema && \
+    gem install \
+    asciidoctor \
+    asciidoctor-sail \
+    asciidoctor-bibtex \
+    asciidoctor-diagram \
+    asciidoctor-mathematical \
+    asciidoctor-pdf \
+    citeproc-ruby \
+    coderay \
+    csl-styles \
+    json \
+    pygments.rb \
+    rghost \
+    rouge \
+    ruby_dev && \
+    npm install -g wavedrom-cli@2.6.8 bytefield-svg@1.8.0 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*