From bed6a2379919cf1b2d3305bb449fa79f21770f83 Mon Sep 17 00:00:00 2001
From: Ned Bingham <edward.bingham@broccolimicro.io>
Date: Fri, 21 Jun 2024 17:11:22 +0000
Subject: [PATCH] small bugfixes

---
 Dockerfile | 18 +++++-------------
 Makefile   |  6 +++---
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2e8fbd8..9ee4589 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -115,9 +115,9 @@ RUN cp prsim/prsim chan.py measure.py sim2vcd.py tlint/tlint spi2act/spi2act.py
 RUN apt-get install -y graphviz
 
 # install Haystack
-RUN echo "building haystack"
+RUN echo "Haystack"
 WORKDIR /toolsrc
-RUN git clone https://github.com/nbingham1/haystack.git --branch v0.1.2
+RUN git clone https://github.com/broccolimicro/haystack.git --branch v0.2.2
 WORKDIR haystack
 RUN git submodule update --init --recursive
 WORKDIR lib
@@ -130,13 +130,7 @@ RUN cp hseplot/plot /opt/cad/bin
 RUN cp bubble/bubble /opt/cad/bin
 RUN cp prsim/prsim /opt/cad/bin/prsimh # don't overwrite act's prsim
 RUN cp gated/gated /opt/cad/bin
-RUN cp prsize/size /opt/cad/bin
-WORKDIR ../old/chp2hse
-RUN make
-RUN cp chp2hse /opt/cad/bin
-WORKDIR ../hse2prs
-RUN make
-RUN cp hse2prs /opt/cad/bin
+RUN cp prsize/prsize /opt/cad/bin
 
 # install go
 WORKDIR /toolsrc
@@ -149,7 +143,7 @@ RUN GOPATH=/opt/go /opt/go/bin/go install golang.org/x/lint/golint@latest
 # install gaw
 RUN apt-get update --fix-missing; DEBIAN_FRONTEND=noninteractive apt-get install -y libgtk-3-dev libcanberra-gtk3-module
 WORKDIR /toolsrc
-RUN git clone https://git.broccolimicro.io/Broccoli/waveview.git
+RUN git clone https://git.broccolimicro.io/Broccoli/waveview.git --branch v1.0.0
 WORKDIR waveview
 RUN ./configure --prefix=/opt/cad
 RUN make
@@ -167,7 +161,7 @@ RUN cp prdbase prspice /opt/cad/bin
 
 # install pr
 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 --branch v0.0.4
+RUN git clone https://github.com/broccolimicro/pr.git --branch v0.0.5
 RUN cp pr/pr pr/scripts/* /opt/cad/bin
 
 # install magic layout tool
@@ -188,7 +182,6 @@ RUN source /opt/python/bin/activate
 ENV PATH="/opt/python/bin:$PATH"
 
 # install floret
-RUN echo "hello"
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libqhull-dev zlib1g-dev python3.10-dev tup
 WORKDIR /toolsrc
 RUN git clone https://github.com/broccolimicro/floret.git
@@ -211,7 +204,6 @@ RUN ./etc/DependencyInstaller.sh -base
 RUN ./tools/OpenROAD/etc/DependencyInstaller.sh -base
 
 COPY --from=0 /opt/* /opt
-COPY --from=0 /usr/local/share/gaw /user/local/share
 
 WORKDIR /toolsrc
 COPY --from=0 /toolsrc/hwloc-2.8.0 /toolsrc/hwloc-2.8.0
diff --git a/Makefile b/Makefile
index e9889cc..78d5ad9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 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 -t public.ecr.aws/l5h5o6z4/broccoli-cli:latest .
+	DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t broccolimicro/broccoli-cli:latest .
 
 push:
-	docker push public.ecr.aws/l5h5o6z4/broccoli-cli:latest
+	docker push broccolimicro/broccoli-cli:latest
 
 pull:
-	docker pull public.ecr.aws/l5h5o6z4/broccoli-cli:latest
+	docker pull broccolimicro/broccoli-cli:latest