Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated base image to debian:bookworm-slim #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions quartus-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-FileCopyrightText: (c) 2022, Marcus Andrade
################################################################################

FROM debian:stretch-slim
FROM debian:bookworm-slim

ENV DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion quartus22.1/local/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down