Skip to content

Commit

Permalink
recipes: replaced apt with apt-get, as it is more reliable in scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigomelo9 committed Dec 9, 2024
1 parent b8fbf3d commit f9d027f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
11 changes: 5 additions & 6 deletions recipes/langutils
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ WORKDIR /root
# Dependencies
#

RUN apt update -qq \
&& DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
# Common
build-essential \
ca-certificates \
Expand All @@ -19,7 +19,6 @@ RUN apt update -qq \
# vhd2vl
flex \
bison \
iverilog \
# Surelog
cmake \
default-jre \
Expand All @@ -28,9 +27,9 @@ RUN apt update -qq \
&& curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor -o /usr/share/keyrings/bazel-archive-keyring.gpg \
&& echo "deb [signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] \
https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
&& apt update -qq \
&& DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends bazel \
&& apt autoclean && apt clean && apt -y autoremove \
&& apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends bazel \
&& apt-get autoclean && apt-get clean && apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*

#
Expand Down
14 changes: 7 additions & 7 deletions recipes/synthesis
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ WORKDIR /root
# Dependencies
#

RUN apt update -qq \
&& DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
# Common
build-essential \
ca-certificates \
git \
python3 \
zlib1g-dev \
# GHDL
gnat \
Expand All @@ -23,12 +24,11 @@ RUN apt update -qq \
tcl-dev \
libffi-dev \
pkg-config \
python3 \
# Synlig
cmake \
default-jre \
python3-orderedmultidict \
&& apt autoclean && apt clean && apt -y autoremove \
&& apt-get autoclean && apt-get clean && apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*

#
Expand Down Expand Up @@ -83,12 +83,12 @@ RUN cd /usr/local/lib && rm -fr libghdlvpi.so libghw.so python3.* \

FROM ubuntu:latest

RUN apt update -qq \
&& DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
gnat \
libreadline-dev \
tcl-dev \
&& apt autoclean && apt clean && apt -y autoremove \
&& apt-get autoclean && apt-get clean && apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*

COPY --from=build /usr/local/bin /usr/local/bin
Expand Down

0 comments on commit f9d027f

Please sign in to comment.