From c3f0f6e5f3906e5b56b6e1d5ad8aae9189d3a3f9 Mon Sep 17 00:00:00 2001
From: Ned Bingham <edward.bingham@broccolimicro.io>
Date: Thu, 25 May 2023 23:58:16 -0400
Subject: [PATCH] updating haystack

---
 Dockerfile | 10 ++++------
 Makefile   |  4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7a32750..16b7a0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,11 +20,13 @@ RUN make install
 # install Trilinos
 WORKDIR /toolsrc
 # 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
 RUN apt-get install -y autoconf automake git
 # parallel dependencies
 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 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 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
 WORKDIR "/"
 ADD home template
@@ -140,7 +139,7 @@ RUN cp prsim/prsim chan.py measure.py sim2vcd.py tlint/tlint spi2act/spi2act.py
 
 # install Haystack
 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
 RUN git submodule update --init --recursive
 WORKDIR lib
@@ -163,7 +162,6 @@ RUN cp prdbase prspice /opt/cad/bin
 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 cp -r pr/* /opt/cad/bin
-#RUN cp pr/* /opt/cad/bin
 
 # Clean up source code folder
 #RUN rm -rf /toolsrc
diff --git a/Makefile b/Makefile
index 8152e81..e761a70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
 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 .