Merge pull request #292 from aatmanvaidya/pinned-dep-fix

fix: adding base requirements to media worker dockerfiles

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 
 
+## v0.6.1 (2024-05-06)
+
+### Fix
+
+* fix: tqdm vulnerable version update ([`841a748`](https://github.com/tattle-made/feluda/commit/841a748aa5d87afa4df2ca225107100b422d50b5))
+
+### Unknown
+
+* Merge pull request #291 from tattle-made/hotfix
+
+Hotfix ([`4ed81ab`](https://github.com/tattle-made/feluda/commit/4ed81abf1d887743bb84687da109f67af4b6a3ca))
+
+* Merge pull request #290 from duggalsu/fix_dependabot_20240506
+
+Fix dependabot issues ([`444a06f`](https://github.com/tattle-made/feluda/commit/444a06fc19892fc8b5d675d0221d7f79c1ea95c3))
+
+
 ## v0.6.0 (2024-05-01)
 
 ### Chore

src/worker/media/Dockerfile.media_worker

@@ -25,13 +25,14 @@ RUN python -m venv /home/python/app/venv \
 # Set venv in path
 ENV PATH="/home/python/app/venv/bin:$PATH"
 
-# Copy core and operator requirements
+# Copy base, core and operator requirements
+COPY --chown=python:python base_requirements.txt /home/python/app/base_requirements.txt
 COPY --chown=python:python requirements.txt /home/python/app/requirements.txt
 COPY --chown=python:python ./core/operators/vid_vec_rep_resnet_requirements.txt /home/python/app/core/operators/vid_vec_rep_resnet_requirements.txt
 COPY --chown=python:python ./core/operators/audio_vec_embedding_requirements.txt /home/python/app/core/operators/audio_vec_embedding_requirements.txt
 
 # Run pip install
-RUN pip install --no-cache-dir --upgrade pip \
+RUN pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/base_requirements.txt \
     && pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/requirements.txt \
     && pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/core/operators/vid_vec_rep_resnet_requirements.txt \
     && pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/core/operators/audio_vec_embedding_requirements.txt

src/worker/media/Dockerfile.media_worker_graviton

@@ -25,13 +25,14 @@ RUN python -m venv /home/python/app/venv \
 # Set venv in path
 ENV PATH="/home/python/app/venv/bin:$PATH"
 
-# Copy core and operator requirements
+# Copy base, core and operator requirements
+COPY --chown=python:python base_requirements.txt /home/python/app/base_requirements.txt
 COPY --chown=python:python requirements.txt /home/python/app/requirements.txt
 COPY --chown=python:python ./core/operators/vid_vec_rep_resnet_requirements.txt /home/python/app/core/operators/vid_vec_rep_resnet_requirements.txt
 COPY --chown=python:python ./core/operators/audio_vec_embedding_requirements.txt /home/python/app/core/operators/audio_vec_embedding_requirements.txt
 
 # Run pip install
-RUN pip install --no-cache-dir --upgrade pip \
+RUN pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/base_requirements.txt \
     && pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/requirements.txt \
     && pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/core/operators/vid_vec_rep_resnet_requirements.txt \
     && pip install --no-cache-dir --require-hashes --no-deps -r /home/python/app/core/operators/audio_vec_embedding_requirements.txt