Broccoli/broccoli-cli
3
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

updating haystack

Browse Source
This commit is contained in:
Edward Arthur Bingham 2023-05-25 23:58:16 -04:00
parent ae9276f2f9
commit c3f0f6e5f3
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -20,11 +20,13 @@ RUN make install
# install Trilinos # install Trilinos
WORKDIR /toolsrc WORKDIR /toolsrc
# basic dependencies # basic dependencies
RUN apt-get install -y gcc g++ gfortran make cmake flex libfl-dev libfftw3-dev libsuitesparse-dev libblas-dev liblapack-dev libtool python3 RUN apt-get install -y gcc g++ gfortran make cmake flex libfl-dev libfftw3-dev libsuitesparse-dev libblas-dev liblapack-dev libtool
# building from git repo dependencies # building from git repo dependencies
RUN apt-get install -y autoconf automake git RUN apt-get install -y autoconf automake git
# parallel dependencies # parallel dependencies
RUN apt-get install -y libhwloc15 libopenmpi-dev openmpi-bin openmpi-common RUN apt-get install -y libhwloc15 libopenmpi-dev openmpi-bin openmpi-common
# install python
RUN apt-get update --fix-missing; DEBIAN_FRONTEND=noninteractive apt-get install -y python3 pip
RUN apt-get install -y bison RUN apt-get install -y bison
RUN git clone --shallow-since 2022-09-15 --branch develop https://github.com/trilinos/Trilinos.git RUN git clone --shallow-since 2022-09-15 --branch develop https://github.com/trilinos/Trilinos.git
@ -66,9 +68,6 @@ RUN apt-get -y install wget
RUN /usr/bin/wget https://go.dev/dl/go1.19.1.linux-amd64.tar.gz RUN /usr/bin/wget https://go.dev/dl/go1.19.1.linux-amd64.tar.gz
RUN tar -C /opt -xzf go1.19.1.linux-amd64.tar.gz RUN tar -C /opt -xzf go1.19.1.linux-amd64.tar.gz
# install python
RUN apt-get update --fix-missing; DEBIAN_FRONTEND=noninteractive apt-get install -y python3 pip
# install editors # install editors
WORKDIR "/" WORKDIR "/"
ADD home template ADD home template
@ -140,7 +139,7 @@ RUN cp prsim/prsim chan.py measure.py sim2vcd.py tlint/tlint spi2act/spi2act.py
# install Haystack # install Haystack
WORKDIR /toolsrc WORKDIR /toolsrc
RUN git clone https://github.com/nbingham1/haystack.git RUN git clone https://github.com/nbingham1/haystack.git --branch v0.0.0
WORKDIR haystack WORKDIR haystack
RUN git submodule update --init --recursive RUN git submodule update --init --recursive
WORKDIR lib WORKDIR lib
@ -163,7 +162,6 @@ RUN cp prdbase prspice /opt/cad/bin
WORKDIR /toolsrc WORKDIR /toolsrc
RUN --mount=type=secret,id=user --mount=type=secret,id=token git clone https://$(cat /run/secrets/user):$(cat /run/secrets/token)@git.broccolimicro.io/Broccoli/pr.git RUN --mount=type=secret,id=user --mount=type=secret,id=token git clone https://$(cat /run/secrets/user):$(cat /run/secrets/token)@git.broccolimicro.io/Broccoli/pr.git
RUN cp -r pr/* /opt/cad/bin RUN cp -r pr/* /opt/cad/bin
#RUN cp pr/* /opt/cad/bin
# Clean up source code folder # Clean up source code folder
#RUN rm -rf /toolsrc #RUN rm -rf /toolsrc

4
Makefile
View File

@ -1,5 +1,3 @@
all: all:
DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t git.broccolimicro.io/broccoli/broccoli-cli:latest . DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t git.broccolimicro.io/broccoli/broccoli-cli:latest -t public.ecr.aws/l5h5o6z4/broccoli-cli:latest .
local:
DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t git.broccolimicro.io/broccoli/broccoli-cli:latest --add-host=git.broccolimicro.io:10.0.0.65 .