Skip to content

Commit 7b3d35b

Browse files
Merge pull request #251 from gustaveroussy/chore/arg-for-sopa-version
chore: add SOPA_VERSION build arg
2 parents 08fe33a + a5a5fdc commit 7b3d35b

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,5 @@ jobs:
110110
platforms: linux/amd64
111111
tags: ${{ vars.DOCKERHUB_USERNAME }}/sopa:${{ env.VERSION }}${{ matrix.extra-name }}
112112
context: ./docker/sopa${{ matrix.extra-name }}
113+
build-args: |
114+
SOPA_VERSION=${{ env.VERSION }}

docker/sopa-baysor/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM python:3.10-slim
22

3+
ARG SOPA_VERSION
4+
35
RUN apt-get update && apt-get install -y wget unzip procps && apt-get clean && rm -rf /var/lib/apt/lists/*
46

57
RUN cd /tmp && wget 'https://github.com/kharchenkolab/Baysor/releases/download/v0.7.1/baysor-x86_x64-linux-v0.7.1_build.zip' && unzip baysor-x86_x64-linux-v0.7.1_build.zip && mv ./bin/baysor /opt/ && rm ./baysor-x86_x64-linux-v0.7.1_build.zip
@@ -8,6 +10,6 @@ ENV PATH="/opt/baysor/bin:${PATH}"
810
# to avoid permission issues with the numba cache
911
ENV NUMBA_CACHE_DIR=/tmp/numba_cache
1012

11-
RUN pip install --no-cache-dir sopa[baysor]
13+
RUN pip install --no-cache-dir sopa[baysor]==${SOPA_VERSION}
1214

1315
ENV PYTHONUNBUFFERED=1

docker/sopa-cellpose/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM python:3.10-slim
22

3+
ARG SOPA_VERSION
4+
35
# needed for the open-cv dependency
46
RUN apt-get update && apt-get install -y \
57
ffmpeg \
@@ -11,6 +13,6 @@ RUN apt-get update && apt-get install -y \
1113
# to avoid permission issues with the numba cache
1214
ENV NUMBA_CACHE_DIR=/tmp/numba_cache
1315

14-
RUN pip install --no-cache-dir sopa[cellpose]
16+
RUN pip install --no-cache-dir sopa[cellpose]==${SOPA_VERSION}
1517

1618
ENV PYTHONUNBUFFERED=1

docker/sopa-proseg/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ RUN cargo install proseg
44

55
FROM python:3.10-slim
66

7+
ARG SOPA_VERSION
8+
79
COPY --from=rust-builder /usr/local/cargo/bin/proseg /usr/local/bin/proseg
810

911
RUN apt-get update && apt-get install -y procps && apt-get clean && rm -rf /var/lib/apt/lists/*
1012

1113
# to avoid permission issues with the numba cache
1214
ENV NUMBA_CACHE_DIR=/tmp/numba_cache
1315

14-
RUN pip install --no-cache-dir sopa
16+
RUN pip install --no-cache-dir sopa==${SOPA_VERSION}
1517

1618
ENV PYTHONUNBUFFERED=1

docker/sopa-stardist/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM python:3.10-slim
22

3+
ARG SOPA_VERSION
4+
35
# needed for the open-cv dependency
46
RUN apt-get update && apt-get install -y \
57
ffmpeg \
@@ -11,6 +13,6 @@ RUN apt-get update && apt-get install -y \
1113
# to avoid permission issues with the numba cache
1214
ENV NUMBA_CACHE_DIR=/tmp/numba_cache
1315

14-
RUN pip install --no-cache-dir sopa[stardist]
16+
RUN pip install --no-cache-dir sopa[stardist]==${SOPA_VERSION}
1517

1618
ENV PYTHONUNBUFFERED=1

docker/sopa/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM python:3.10-slim
22

3+
ARG SOPA_VERSION
4+
35
# needed for the open-cv dependency
46
RUN apt-get update && apt-get install -y \
57
ffmpeg \
@@ -11,6 +13,6 @@ RUN apt-get update && apt-get install -y \
1113
# to avoid permission issues with the numba cache
1214
ENV NUMBA_CACHE_DIR=/tmp/numba_cache
1315

14-
RUN pip install --no-cache-dir sopa
16+
RUN pip install --no-cache-dir sopa==${SOPA_VERSION}
1517

1618
ENV PYTHONUNBUFFERED=1

0 commit comments

Comments
 (0)