From 2f2c209116abc33e5a4970f4e5ec6c3bdc98b2dd Mon Sep 17 00:00:00 2001
From: tmeissner <programming@goodcleanfun.de>
Date: Wed, 25 Mar 2020 01:16:29 +0100
Subject: [PATCH] Add apt-upgrade; minor optimizations

---
 ghdl-formal.Dockerfile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ghdl-formal.Dockerfile b/ghdl-formal.Dockerfile
index 1e92e93..420f360 100644
--- a/ghdl-formal.Dockerfile
+++ b/ghdl-formal.Dockerfile
@@ -3,18 +3,15 @@
 FROM symbiyosys as symbiyosys-ghdl
 
 ARG LLVM_VER="7"
-ARG GNAT_VER="8"
+#ARG GNAT_VER="8"
 
 RUN apt-get update -qq && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
     gnat \
-    zlib1g-dev \
     llvm-dev && \
     apt-get autoclean && apt-get clean && apt-get -y autoremove && \
-    rm -rf /var/lib/apt/lists/*
-
-# Build GHDL
-RUN cd /root && \
+    rm -rf /var/lib/apt/lists/* && \
+    cd /root && \
     mkdir ghdl && \
     cd ghdl && \
     curl https://codeload.github.com/ghdl/ghdl/tar.gz/master | tar xzf - --strip-components=1 && \
@@ -51,7 +48,7 @@ RUN apt-get update -qq && \
     gcc \
     make \
     python3 && \
-    apt-get autoclean && apt-get clean && apt-get -y autoremove && \
+    apt-get upgrade && apt-get autoclean && apt-get clean && apt-get -y autoremove && \
     update-ca-certificates && \
     rm -rf /var/lib/apt/lists/*