Skip to content

Commit 3a19cb3

Browse files
keighrimkeighrim
committed
added base images with HF libraries, retired torch1 images
1 parent a030f16 commit 3a19cb3

19 files changed

+68
-17
lines changed

‎container/ffmpeg-hf.containerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-ffmpeg-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-hf image is shipped with clams-python, ffmpeg, and vairous huggingface libraries (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets
7+

‎container/ffmpeg-tf2-hf.containerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-ffmpeg-tf2-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-tf2-hf image is shipped with clams-python, ffmpeg, tensorflow2, and vairous huggingface libraries"
4+
5+
RUN pip install --no-cache-dir transformers[tf,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets
7+

‎container/ffmpeg-tf2.containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python-ffmpeg:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-ffmpeg-tf2 image is shipped with clams-python, ffmpeg and tensorflow2 libraries"
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-tf2 image is shipped with clams-python, ffmpeg, and tensorflow2"
44

55
RUN apt-get install -y build-essential libhdf5-dev
66
RUN pip install --no-cache-dir tensorflow==2.*
7+

‎container/ffmpeg-torch2.containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python-ffmpeg:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-ffmpeg-torch image is shipped with clams-python, ffmpeg and PyTorch2"
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-torch2 image is shipped with clams-python, ffmpeg, and PyTorch2"
44

55
RUN pip install --no-cache-dir torch==2.*
6+

‎container/ffmpeg-torch.containerfile renamed to ‎container/ffmpeg-transformers4.containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python-ffmpeg:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-ffmpeg-torch image is shipped with clams-python, ffmpeg and PyTorch"
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg-transformers4 image is shipped with clams-python, ffmpeg and HF's transformers4"
44

5-
RUN pip install --no-cache-dir torch==1.*
5+
RUN pip install --no-cache-dir transformers==4.*

‎container/ffmpeg.containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-ffmpeg image is shipped with clams-python and ffmpeg (+ python binding)"
3+
LABEL org.opencontainers.image.description="clams-python-ffmpeg image is shipped with clams-python and ffmpeg"
44

55
RUN apt-get update && apt-get install -y ffmpeg
66
RUN pip install --no-cache-dir ffmpeg-python==0.2.*
7+

‎container/hf.containerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python--torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-hf image is shipped with clams-python and vairous huggingface libraries (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets
7+

‎container/jdk8.containerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ LABEL org.opencontainers.image.description="clams-python-jdk8 image is shipped w
55
ENV JAVA_HOME=/opt/java/openjdk
66
COPY --from=eclipse-temurin:8 $JAVA_HOME $JAVA_HOME
77
ENV PATH="${JAVA_HOME}/bin:${PATH}"
8+

‎container/opencv4-hf.containerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-opencv4-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-hf image is shipped with clams-python, opencv4 (ffmpeg backend), and vairous huggingface libraries (PyTorch backend)"
4+
5+
RUN pip install --no-cache-dir transformers[torch,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets
7+

‎container/opencv4-tf2-hf.containerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-opencv4-tf2-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-tf2-hf image is shipped with clams-python, opencv4 (ffmpeg backend), tensorflow2, and vairous huggingface libraries"
4+
5+
RUN pip install --no-cache-dir transformers[tf,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets
7+

‎container/opencv4-tf2.containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python-opencv4:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-opencv4-tf2 image is shipped with clams-python, ffmpeg, opencv4 and tensorflow2 libraries"
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-tf2 image is shipped with clams-python, opencv4 (ffmpeg backend), and tensorflow2"
44

55
RUN apt-get install -y build-essential libhdf5-dev
66
RUN pip install --no-cache-dir tensorflow==2.*
7+

‎container/opencv4-torch2.containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python-opencv4:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-opencv4-torch image is shipped with clams-python, ffmpeg, opencv4, and PyTorch2"
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-torch2 image is shipped with clams-python, opencv4 (ffmpeg backend), and PyTorch2"
44

55
RUN pip install --no-cache-dir torch==2.*
6+

‎container/opencv4-torch.containerfile renamed to ‎container/opencv4-transformers4.containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python-opencv4:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-opencv4-torch image is shipped with clams-python, ffmpeg, opencv4, and PyTorch"
3+
LABEL org.opencontainers.image.description="clams-python-opencv4-transformers4 image is shipped with clams-python, ffmpeg, opencv4, and HF's transformers4"
44

5-
RUN pip install --no-cache-dir torch==1.*
5+
RUN pip install --no-cache-dir transformers==4.*

‎container/opencv4.containerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG clams_version
2-
FROM ghcr.io/clamsproject/clams-python-ffmpeg:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-opencv image is shipped with clams-python, ffmpeg, and opencv4 with their python bindings"
2+
FROM ghcr.io/clamsproject/clams-python--ffmpeg:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-opencv4 image is shipped with clams-python and opencv4 (ffmpeg backend)"
44

55
ARG OPENCV_VERSION=4.10.0
66
ARG OPENCV_PATH=/opt/opencv-${OPENCV_VERSION}
@@ -43,3 +43,4 @@ RUN rm -rf ${OPENCV_PATH} ${OPENCV_EXTRA_PATH}
4343
RUN pip uninstall opencv-python
4444
RUN pip install --no-cache-dir opencv-python-headless~=${OPENCV_VERSION}
4545
RUN apt-get remove -y g++ cmake make wget unzip libavcodec-dev libavformat-dev libavutil-dev libswscale-dev && apt-get autoremove -y
46+

‎container/tf2-hf.containerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python-tf2-torch2:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-tf2-hf image is shipped with clams-python, tensorflow2, and vairous huggingface libraries"
4+
5+
RUN pip install --no-cache-dir transformers[tf,tokenizers]==4.*
6+
RUN pip install --no-cache-dir datasets
7+

‎container/tf2.containerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ LABEL org.opencontainers.image.description="clams-python-tf2 image is shipped wi
44

55
RUN apt-get install -y build-essential libhdf5-dev
66
RUN pip install --no-cache-dir tensorflow==2.*
7+

‎container/torch.containerfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎container/torch2.containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG clams_version
22
FROM ghcr.io/clamsproject/clams-python:$clams_version
3-
LABEL org.opencontainers.image.description="clams-python-ffmpeg image is shipped with clams-python and PyTorch2"
3+
LABEL org.opencontainers.image.description="clams-python-torch2 image is shipped with clams-python and PyTorch2"
44

55
RUN pip install --no-cache-dir torch==2.*
6+

‎container/transformers4.containerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ARG clams_version
2+
FROM ghcr.io/clamsproject/clams-python:$clams_version
3+
LABEL org.opencontainers.image.description="clams-python-transformers4 image is shipped with clams-python and HF's transformers4"
4+
5+
RUN pip install --no-cache-dir transformers==4.*

0 commit comments

Comments
 (0)