Skip to content

Commit

Permalink
docker adjs
Browse files Browse the repository at this point in the history
  • Loading branch information
carueda committed Jun 27, 2024
1 parent d3702e2 commit dfd63c0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

2024-06

- did new pypi release to fix links, etc., and in preparation to
generate corresponding new version of docker image.
- did the pending "pypam-based-processing" to "pbp" renaming.
The ones related with docker may need review.

Expand Down
9 changes: 3 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ WORKDIR /opt/pbp

RUN apt-get update && apt-get install -y libsox-fmt-all libsox-dev

# TODO PBP should be installed from published package.
# For now, grabbing the latest from their repos.
RUN git clone https://github.com/mbari-org/pbp.git \
&& cd pbp \
&& pip install -r requirements.txt \
&& /opt/conda/bin/conda install jupyter -y --quiet
# Note: tentative adjustments
RUN /opt/conda/bin/conda install jupyter -y --quiet
RUN pip install mbari-pbp==0.3.0b18

ENV PYTHONPATH /opt/pbp:/opt/pbp/pbp
EXPOSE 8899
Expand Down
6 changes: 1 addition & 5 deletions docker/Dockerfile-minimal
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ FROM quay.io/jupyter/minimal-notebook:latest

WORKDIR /opt/pbp

# TODO both PyPAM and PBP should be installed from published packages.
# For now, grabbing the latest from their repos.
RUN git clone https://github.com/mbari-org/pbp.git \
&& cd pbp \
&& pip install -r requirements.txt
RUN pip install mbari-pbp==0.3.0b18

USER root
RUN apt-get update && apt-get install -y libsox-fmt-all libsox-dev
Expand Down

0 comments on commit dfd63c0

Please sign in to comment.