From cd851424febc4688200cdf82be90806bc49c425a Mon Sep 17 00:00:00 2001
From: Nick Klockenga <nick@klockenga.net>
Date: Thu, 7 Sep 2023 16:21:58 -0400
Subject: [PATCH] move pip install of seedsigner working directory to setup.sh

---
 docker-compose.yml |  2 +-
 docker/Dockerfile  | 17 +++++++----------
 docker/setup.sh    |  4 ++++
 requirements.txt   |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100755 docker/setup.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 342b778f..17c45115 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,6 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile
-    command: sh -c 'bash -c "tail -f /dev/null"'
+    command: sh -c 'bash -c "docker/setup.sh"'
     volumes:
       - ../seedsigner:/seedsigner
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 494d969a..32a1a7ca 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,20 +4,17 @@ FROM python:3.10-bullseye
 RUN apt-get -qq update
 RUN apt-get -y -qq install zbar-tools
 
-# temp add/copy seedsigner local repo to do pip3 install
-ADD . /seedsigner
-WORKDIR /seedsigner
-
-#COPY ../requirements.txt /requirements.txt
-#COPY ../tests/requirements.txt /tests-requirements.txt
+# temp copy requirements files to local repo to do pip3 install
+COPY ../requirements.txt /requirements.txt
+COPY ../tests/requirements.txt /tests-requirements.txt
 
+WORKDIR /
 RUN pip3 install -r requirements.txt
-RUN pip3 install -r tests/requirements.txt
-RUN pip3 install -e .
+RUN pip3 install -r tests-requirements.txt
 
 # clean up copied files
-WORKDIR /
-RUN rm -r /seedsigner
+RUN rm /requirements.txt
+RUN rm /tests-requirements.txt
 
 # set working dir
 WORKDIR /seedsigner
\ No newline at end of file
diff --git a/docker/setup.sh b/docker/setup.sh
new file mode 100755
index 00000000..d31b5f9c
--- /dev/null
+++ b/docker/setup.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+pip3 install -e .
+tail -f /dev/null
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index e24650d4..58bdc59f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 embit==0.7.0
 numpy==1.21.1
 Pillow==8.2.0
--e git+https://github.com/seedsigner/pyzbar.git@c3c237821c6a20b17953efe59b90df0b514a1c03#egg=pyzbar
+pyzbar @ git+https://github.com/seedsigner/pyzbar.git@c3c237821c6a20b17953efe59b90df0b514a1c03
 qrcode==7.3.1
 six==1.16.0
 urtypes @ git+https://github.com/selfcustody/urtypes.git@7fb280eab3b3563dfc57d2733b0bf5cbc0a96a6a