diff --git a/recipes/langutils b/recipes/langutils index e7b5ebf..b2df89e 100644 --- a/recipes/langutils +++ b/recipes/langutils @@ -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 \ @@ -19,7 +19,6 @@ RUN apt update -qq \ # vhd2vl flex \ bison \ - iverilog \ # Surelog cmake \ default-jre \ @@ -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/* # diff --git a/recipes/synthesis b/recipes/synthesis index eb07c03..5d3332d 100644 --- a/recipes/synthesis +++ b/recipes/synthesis @@ -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 \ @@ -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/* # @@ -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