Skip to content

Commit cd85142

Browse files
committed
move pip install of seedsigner working directory to setup.sh
1 parent ee4d914 commit cd85142

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

Diff for: docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ services:
55
build:
66
context: .
77
dockerfile: docker/Dockerfile
8-
command: sh -c 'bash -c "tail -f /dev/null"'
8+
command: sh -c 'bash -c "docker/setup.sh"'
99
volumes:
1010
- ../seedsigner:/seedsigner

Diff for: docker/Dockerfile

+7-10
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@ FROM python:3.10-bullseye
44
RUN apt-get -qq update
55
RUN apt-get -y -qq install zbar-tools
66

7-
# temp add/copy seedsigner local repo to do pip3 install
8-
ADD . /seedsigner
9-
WORKDIR /seedsigner
10-
11-
#COPY ../requirements.txt /requirements.txt
12-
#COPY ../tests/requirements.txt /tests-requirements.txt
7+
# temp copy requirements files to local repo to do pip3 install
8+
COPY ../requirements.txt /requirements.txt
9+
COPY ../tests/requirements.txt /tests-requirements.txt
1310

11+
WORKDIR /
1412
RUN pip3 install -r requirements.txt
15-
RUN pip3 install -r tests/requirements.txt
16-
RUN pip3 install -e .
13+
RUN pip3 install -r tests-requirements.txt
1714

1815
# clean up copied files
19-
WORKDIR /
20-
RUN rm -r /seedsigner
16+
RUN rm /requirements.txt
17+
RUN rm /tests-requirements.txt
2118

2219
# set working dir
2320
WORKDIR /seedsigner

Diff for: docker/setup.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
pip3 install -e .
4+
tail -f /dev/null

Diff for: requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
embit==0.7.0
22
numpy==1.21.1
33
Pillow==8.2.0
4-
-e git+https://github.com/seedsigner/pyzbar.git@c3c237821c6a20b17953efe59b90df0b514a1c03#egg=pyzbar
4+
pyzbar @ git+https://github.com/seedsigner/pyzbar.git@c3c237821c6a20b17953efe59b90df0b514a1c03
55
qrcode==7.3.1
66
six==1.16.0
77
urtypes @ git+https://github.com/selfcustody/urtypes.git@7fb280eab3b3563dfc57d2733b0bf5cbc0a96a6a

0 commit comments

Comments
 (0)