From 9ac188d7b0fde3da62738fa77c1f9cbb289b632e Mon Sep 17 00:00:00 2001
From: mbtaylor1982 <mike@dewberryfields.com>
Date: Tue, 22 Oct 2024 21:50:35 +0100
Subject: [PATCH 1/2] updated base image to debian:bookworm-slim and

---
 quartus-base/Dockerfile | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/quartus-base/Dockerfile b/quartus-base/Dockerfile
index b3ecfdf..bf64398 100644
--- a/quartus-base/Dockerfile
+++ b/quartus-base/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-FileCopyrightText: (c) 2022, Marcus Andrade
 ################################################################################
 
-FROM debian:stretch-slim
+FROM debian:bookworm-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -80,7 +80,8 @@ RUN apt-get update                          && \
                        make                    \
                        nano                    \
                        net-tools               \
-                       openjdk-8-jdk           \
+                       openjdk-17-jre          \
+                       libpng16-16             \
                        pkg-config              \
                        python3-pip             \
                        rsync                   \
@@ -110,17 +111,13 @@ ENV LC_ALL=en_US.UTF-8
 WORKDIR /tmp
 
 # Copy libpng, Github CLI and Changelog generator
-ARG GH_VERSION="2.14.2"
-ARG CHGLOG_VERSION="0.15.1"
-ADD libs/libpng12-0_1.2.54-1ubuntu1.1_amd64.deb .
-ADD libs/libpng12-0_1.2.54-1ubuntu1.1_i386.deb .
+ARG GH_VERSION="2.54.0"
+ARG CHGLOG_VERSION="0.15.4"
 ADD https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.deb .
 ADD https://github.com/git-chglog/git-chglog/releases/download/v${CHGLOG_VERSION}/git-chglog_${CHGLOG_VERSION}_linux_amd64.tar.gz .
 
 # Install libpng, Github CLI and Changelog generator
-RUN dpkg -i libpng12-0_1.2.54-1ubuntu1.1_amd64.deb \
-            libpng12-0_1.2.54-1ubuntu1.1_i386.deb  \
-            gh_${GH_VERSION}_linux_amd64.deb
+RUN dpkg -i gh_${GH_VERSION}_linux_amd64.deb
 
 RUN tar -zxf git-chglog_${CHGLOG_VERSION}_linux_amd64.tar.gz && \
     chmod a+x git-chglog                                     && \

From 1378216b6d0d9223d1d5fd67568e3b5f11c6df5a Mon Sep 17 00:00:00 2001
From: mbtaylor1982 <mike@dewberryfields.com>
Date: Tue, 22 Oct 2024 21:55:00 +0100
Subject: [PATCH 2/2] Fixed 22.1 build

---
 quartus22.1/local/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quartus22.1/local/Dockerfile b/quartus22.1/local/Dockerfile
index 04f95ef..f9f456e 100644
--- a/quartus22.1/local/Dockerfile
+++ b/quartus22.1/local/Dockerfile
@@ -31,7 +31,7 @@ FROM raetro/quartus:base
 COPY --from=install /opt/intelFPGA/ /opt/intelFPGA/
 
 # Load the library from the host system.
-ENV LD_PRELOAD=/usr/lib/libtcmalloc_minimal.so.4
+ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libtcmalloc_minimal.so.4
 
 # Metadata Params
 ARG BUILD_DATE