Dockerfile updates

Remove conditional bash commands and make one per line.
Change ngspice repo to github.
Fix typo in ngspice commit.
Reduce number of cores in klayout compile.
This commit is contained in:
mrg 2022-08-02 09:25:05 -07:00
parent 1177df6193
commit 4b96b539e2
1 changed files with 15 additions and 14 deletions

View File

@ -11,6 +11,7 @@ RUN apt-get --no-install-recommends -y upgrade
# General tools for building etc. # General tools for building etc.
RUN apt-get install --no-install-recommends -y build-essential git ssh vim gosu autoconf automake libtool bison flex RUN apt-get install --no-install-recommends -y build-essential git ssh vim gosu autoconf automake libtool bison flex
# Use bash instead of dash # Use bash instead of dash
# Must be on one line or else ln won't work without a shell!
RUN rm /bin/sh && ln -s /bin/bash /bin/sh RUN rm /bin/sh && ln -s /bin/bash /bin/sh
# Needed by OpenRAM # Needed by OpenRAM
RUN apt-get install --no-install-recommends -y python3 python3-numpy python3-scipy python3-pip python3-matplotlib python3-venv python3-sklearn python3-subunit python3-coverage RUN apt-get install --no-install-recommends -y python3 python3-numpy python3-scipy python3-pip python3-matplotlib python3-venv python3-sklearn python3-subunit python3-coverage
@ -30,8 +31,8 @@ WORKDIR /root
RUN git clone https://github.com/KLayout/klayout RUN git clone https://github.com/KLayout/klayout
WORKDIR /root/klayout WORKDIR /root/klayout
RUN git checkout ${KLAYOUT_COMMIT} RUN git checkout ${KLAYOUT_COMMIT}
RUN ./build.sh -qt5 -debug -j 8 \ RUN ./build.sh -qt5 -debug -j$(nproc)
&& cp -r bin-debug /usr/local/klayout RUN cp -r bin-debug /usr/local/klayout
RUN rm -rf /root/klayout RUN rm -rf /root/klayout
### Trilinos ### ### Trilinos ###
@ -99,15 +100,15 @@ RUN ../configure CXXFLAGS="-O3 -std=c++11" \
RUN make -j 4 install RUN make -j 4 install
### Ngspice ### ### Ngspice ###
ARG NGSPICE_COMIT=032b1c32c4dbad45ff132bcfac1dbecadbd8abb0 ARG NGSPICE_COMMIT=032b1c32c4dbad45ff132bcfac1dbecadbd8abb0
WORKDIR /root WORKDIR /root
RUN git clone git://git.code.sf.net/p/ngspice/ngspice RUN git clone https://github.com/ngspice/ngspice
WORKDIR /root/ngspice WORKDIR /root/ngspice
RUN git checkout ${NGSPICE_COMMIT} RUN git checkout ${NGSPICE_COMMIT}
RUN ./autogen.sh \ RUN ./autogen.sh
&& ./configure --enable-openmp --with-readline \ RUN ./configure --enable-openmp --with-readline
&& make \ RUN make
&& make install RUN make install
RUN rm -rf /root/ngspice RUN rm -rf /root/ngspice
### Netgen ### ### Netgen ###
@ -118,9 +119,9 @@ WORKDIR /root
RUN git clone git://opencircuitdesign.com/netgen netgen RUN git clone git://opencircuitdesign.com/netgen netgen
WORKDIR /root/netgen WORKDIR /root/netgen
RUN git checkout ${NETGEN_COMMIT} RUN git checkout ${NETGEN_COMMIT}
RUN ./configure \ RUN ./configure
&& make -j$(nproc) \ RUN make -j$(nproc)
&& make install RUN make install
RUN rm -rf /root/netgen RUN rm -rf /root/netgen
### iVerilog ### ### iVerilog ###
@ -137,9 +138,9 @@ WORKDIR /root/magic
RUN git checkout ${MAGIC_COMMIT} RUN git checkout ${MAGIC_COMMIT}
COPY mrg.patch /root/magic COPY mrg.patch /root/magic
RUN git apply mrg.patch RUN git apply mrg.patch
RUN ./configure \ RUN ./configure
&& make \ RUN make
&& make install RUN make install
RUN rm -rf /root/magic RUN rm -rf /root/magic