Skip to content

Add build matrix for docker images, update images #1936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MMathisLab merged 16 commits into from
Sep 17, 2023
Merged

Add build matrix for docker images, update images #1936

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a8cb1a3
Add build matrix and build various images
stes Aug 4, 2022
16dd348
Adapt dockerfiles
stes Aug 4, 2022
53c3b25
Improve testing
stes Aug 5, 2022
bb1d610
Add logging functionality
stes Aug 5, 2022
192fb4e
Use nvidia cuda docker images with cudnn8
jeylau Mar 28, 2023
dd252b9
adjust versions in Dockerfile, clean args, add minor comments, dlc 2.3.5
maryapp Aug 17, 2023
6cd026e
commit that corresponds to last 2.3.5 build for 11.4.3
maryapp Aug 17, 2023
a650234
update python to 3.9 and cuda 11.7
maryapp Aug 17, 2023
66c548a
python3.8 and python paths fix (for eventual 3.9), numpy 1.21.6
maryapp Aug 21, 2023
ccf3fb3
tf 10, dlc setup only
maryapp Aug 22, 2023
332d797
numpy 1.24.4
maryapp Aug 22, 2023
35e32b3
Python3.9, TF 2.10, numpy 1.24.0
maryapp Aug 22, 2023
56eb050
Update docker/Dockerfile.base
maryapp Aug 24, 2023
4bb565a
formatter indent 4
maryapp Aug 24, 2023
86bb096
note on gui dockerfile
maryapp Aug 25, 2023
c316497
Merge branch 'DeepLabCut:main' into docker-add-build-matrix
stes Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
commit that corresponds to last 2.3.5 build for 11.4.3
  • Loading branch information
@maryapp @stes
maryapp authored and stes committed Aug 25, 2023
commit 6cd026ef1f08fc418eb7e6e8c3989444beda0416
2 changes: 1 addition & 1 deletion docker/Dockerfile.core
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG CUDA_VERSION
ARG DEEPLABCUT_VERSION
FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-base-cuda${CUDA_VERSION}
FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-base-cuda${CUDA_VERSION}-latest

ENV DLClight True

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG CUDA_VERSION
ARG DEEPLABCUT_VERSION

FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-base-cuda${CUDA_VERSION}
FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-base-cuda${CUDA_VERSION}-latest

RUN DEBIAN_FRONTEND=noninteractive apt-get update -yy \
&& apt-get install -yy --no-install-recommends libgtk-3-dev python3-wxgtk4.0 locales \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.jupyter
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG CUDA_VERSION
ARG DEEPLABCUT_VERSION
FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-core-cuda${CUDA_VERSION}
FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-core-cuda${CUDA_VERSION}-latest

RUN pip3 install --no-cache-dir \
notebook==6.4.12 \
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG CUDA_VERSION=11.4.0-cudnn8-runtime-ubuntu20.04
ARG DEEPLABCUT_VERSION=2.2.1.1
FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-core-cuda${CUDA_VERSION}
ARG CUDA_VERSION
ARG DEEPLABCUT_VERSION
FROM deeplabcut/deeplabcut:${DEEPLABCUT_VERSION}-core-cuda${CUDA_VERSION}-latest

RUN mkdir test/
WORKDIR test
Expand Down
5 changes: 2 additions & 3 deletions docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,8 @@ for arg in "$@"; do
iterate_build_matrix push |
grep -v '\-test\-' |
tr '\n' '\0' |
xargs -I@ -0 bash -c "echo docker push @-latest; \
docker tag @ @-latest; \
docker push @-latest; \
xargs -I@ -0 bash -c "echo docker push @; \
docker push @; \
docker image rm @ |& grep -v 'No such image'"
;;
*)
Expand Down