Skip to content

Commit

Permalink
A fix.
Browse files Browse the repository at this point in the history
Signed-off-by: Revital Sur <eres@il.ibm.com>
  • Loading branch information
revit13 committed Jan 26, 2025
1 parent 5350481 commit 6253bac
Show file tree
Hide file tree
Showing 27 changed files with 103 additions and 103 deletions.
8 changes: 4 additions & 4 deletions kfp/kfp_ray_components/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root shared_workflow_support_lib shared_workflow_support_lib/
COPY --chmod=775 --chown=ray:root shared_workflow_support_lib shared_workflow_support_lib/
RUN cd shared_workflow_support_lib && pip install --no-cache-dir -e .

COPY --chmod=g=u --chown=ray:root workflow_support_lib workflow_support_lib/
COPY --chmod=775 --chown=ray:root workflow_support_lib workflow_support_lib/
RUN cd workflow_support_lib && pip install --no-cache-dir -e .

# overwriting the installation of old versions of pydantic
Expand All @@ -30,7 +30,7 @@ RUN pip install --no-cache-dir pydantic==2.6.3
# remove credentials-containing file
RUN rm requirements.txt
# components
COPY --chmod=g=u --chown=ray:root ./src /pipelines/component/src
COPY --chmod=775 --chown=ray:root ./src /pipelines/component/src

# Set environment
ENV KFP_v2=$KFP_v2
Expand Down
8 changes: 4 additions & 4 deletions tools/ingest2parquet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY requirements.txt requirements.txt
RUN pip install --no-cache-dir -r requirements.txt

RUN rm requirements.txt
# copy source
COPY --chmod=g=u --chown=ray:root ./src .
COPY --chmod=775 --chown=ray:root ./src .
# copy test
COPY --chmod=g=u --chown=ray:root test/ test/
COPY --chmod=g=u --chown=ray:root test-data/ test-data/
COPY --chmod=775 --chown=ray:root test/ test/
COPY --chmod=775 --chown=ray:root test-data/ test-data/
# Set environment
ENV PYTHONPATH /home/ray
6 changes: 3 additions & 3 deletions transforms/Dockerfile.ray.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ARG TRANSFORM_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]


COPY --chmod=g=u --chown=ray:root dpk_${TRANSFORM_NAME}/ dpk_${TRANSFORM_NAME}/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_${TRANSFORM_NAME}/ dpk_${TRANSFORM_NAME}/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install --no-cache-dir -r requirements.txt

# Set environment
Expand Down
12 changes: 6 additions & 6 deletions transforms/code/code2parquet/ray/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root python-transform/ python-transform/
COPY --chmod=775 --chown=ray:root python-transform/ python-transform/
RUN cd python-transform && pip install --no-cache-dir -e .

# Install ray project source
COPY --chmod=g=u --chown=ray:root src/ src/
COPY --chmod=g=u --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=775 --chown=ray:root src/ src/
COPY --chmod=775 --chown=ray:root pyproject.toml pyproject.toml
RUN pip install --no-cache-dir -e .

# copy the main() entry point to the image
COPY --chmod=g=u --chown=ray:root src/code2parquet_transform_ray.py .
COPY --chmod=775 --chown=ray:root src/code2parquet_transform_ray.py .

# copy some of the samples in
COPY --chmod=g=u --chown=ray:root src/code2parquet_local_ray.py local/
COPY --chmod=775 --chown=ray:root src/code2parquet_local_ray.py local/

# copy test
COPY test/ test/
Expand Down
6 changes: 3 additions & 3 deletions transforms/code/code_profiler/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

## Copy the python version of the tansform
COPY --chmod=g=u --chown=ray:root dpk_code_profiler/ dpk_code_profiler/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_code_profiler/ dpk_code_profiler/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install -r requirements.txt

# Set environment
Expand Down
16 changes: 8 additions & 8 deletions transforms/code/code_quality/ray/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root python-transform/ python-transform/
COPY --chmod=775 --chown=ray:root python-transform/ python-transform/
RUN cd python-transform && pip install --no-cache-dir -e .

#COPY requirements.txt requirements.txt
#RUN pip install --no-cache-dir -r requirements.txt

COPY --chmod=g=u --chown=ray:root src/ src/
COPY --chmod=g=u --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=775 --chown=ray:root src/ src/
COPY --chmod=775 --chown=ray:root pyproject.toml pyproject.toml
RUN pip install --no-cache-dir -e .

# copy the main() entry point to the image
COPY --chmod=g=u --chown=ray:root ./src/code_quality_transform_ray.py .
COPY --chmod=775 --chown=ray:root ./src/code_quality_transform_ray.py .

# copy some of the samples in
COPY --chmod=g=u --chown=ray:root ./src/code_quality_local_ray.py local/
COPY --chmod=775 --chown=ray:root ./src/code_quality_local_ray.py local/

# copy test
COPY --chmod=g=u --chown=ray:root test/ test/
COPY --chmod=g=u --chown=ray:root test-data/ test-data/
COPY --chmod=775 --chown=ray:root test/ test/
COPY --chmod=775 --chown=ray:root test-data/ test-data/

# Set environment
ENV PYTHONPATH /home/ray
Expand Down
10 changes: 5 additions & 5 deletions transforms/code/header_cleanser/ray/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root python-transform/ python-transform
COPY --chmod=775 --chown=ray:root python-transform/ python-transform
RUN cd python-transform && pip install --no-cache-dir -e .

COPY --chmod=g=u --chown=ray:root src/ src/
COPY --chmod=g=u --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=775 --chown=ray:root src/ src/
COPY --chmod=775 --chown=ray:root pyproject.toml pyproject.toml
RUN pip install --no-cache-dir -e .

# Install system dependencies, including libgomp1
Expand All @@ -31,7 +31,7 @@ User ray

# copy source data
COPY ./src/header_cleanser_transform_ray.py .
COPY --chmod=g=u --chown=ray:root src/header_cleanser_local_ray.py local/
COPY --chmod=775 --chown=ray:root src/header_cleanser_local_ray.py local/

# copy test
COPY test/ test/
Expand Down
14 changes: 7 additions & 7 deletions transforms/code/license_select/ray/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root python-transform/ python-transform/
COPY --chmod=775 --chown=ray:root python-transform/ python-transform/
RUN cd python-transform && pip install --no-cache-dir -e .

COPY --chmod=g=u --chown=ray:root src/ src/
COPY --chmod=g=u --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=g=u --chown=ray:root README.md README.md
COPY --chmod=775 --chown=ray:root src/ src/
COPY --chmod=775 --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=775 --chown=ray:root README.md README.md
RUN pip install --no-cache-dir -e .

# copy source data
COPY --chmod=g=u --chown=ray:root src/license_select_transform_ray.py .
COPY --chmod=g=u --chown=ray:root src/license_select_local_ray.py local/
COPY --chmod=775 --chown=ray:root src/license_select_transform_ray.py .
COPY --chmod=775 --chown=ray:root src/license_select_local_ray.py local/

# copy test
COPY test/ test/
Expand Down
16 changes: 8 additions & 8 deletions transforms/code/malware/ray/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,24 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root python-transform/ python-transform/
COPY --chmod=775 --chown=ray:root python-transform/ python-transform/
RUN cd python-transform && pip install --no-cache-dir -e .

COPY --chmod=g=u --chown=ray:root src/ src/
COPY --chmod=g=u --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=775 --chown=ray:root src/ src/
COPY --chmod=775 --chown=ray:root pyproject.toml pyproject.toml
RUN pip install --no-cache-dir -e .

# copy the main() entry point to the image
COPY --chmod=g=u --chown=ray:root src/malware_transform_ray.py ./
COPY --chmod=775 --chown=ray:root src/malware_transform_ray.py ./

# copy some of the samples in
COPY --chmod=g=u --chown=ray:root src/malware_local_ray.py local/
COPY --chmod=775 --chown=ray:root src/malware_local_ray.py local/

COPY --chmod=g=u --chown=ray:root test/ test/
COPY --chmod=g=u --chown=ray:root test-data/ test-data/
COPY --chmod=775 --chown=ray:root test/ test/
COPY --chmod=775 --chown=ray:root test-data/ test-data/

ENV PYTHONPATH /home/ray

Expand Down
8 changes: 4 additions & 4 deletions transforms/code/proglang_select/ray/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root python-transform/ python-transform/
COPY --chmod=775 --chown=ray:root python-transform/ python-transform/
RUN cd python-transform && pip install --no-cache-dir -e .

#COPY requirements.txt requirements.txt
#RUN pip install --no-cache-dir -r requirements.txt

COPY --chmod=g=u --chown=ray:root src/ src/
COPY --chmod=g=u --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=775 --chown=ray:root src/ src/
COPY --chmod=775 --chown=ray:root pyproject.toml pyproject.toml
RUN pip install --no-cache-dir -e .

# copy the main() entry point to the image
Expand Down
8 changes: 4 additions & 4 deletions transforms/code/repo_level_ordering/ray/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root src/ src/
COPY --chmod=g=u --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=g=u --chown=ray:root README.md README.md
COPY --chmod=775 --chown=ray:root src/ src/
COPY --chmod=775 --chown=ray:root pyproject.toml pyproject.toml
COPY --chmod=775 --chown=ray:root README.md README.md
RUN pip install --no-cache-dir -e .

# copy source data
Expand Down
6 changes: 3 additions & 3 deletions transforms/language/doc_chunk/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]


COPY --chmod=g=u --chown=ray:root dpk_doc_chunk/ dpk_doc_chunk/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_doc_chunk/ dpk_doc_chunk/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install ${PIP_INSTALL_EXTRA_ARGS} --no-cache-dir -r requirements.txt

# Set environment
Expand Down
6 changes: 3 additions & 3 deletions transforms/language/doc_quality/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

## Copy the python version of the tansform
COPY --chmod=g=u --chown=ray:root dpk_doc_quality/ dpk_doc_quality/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_doc_quality/ dpk_doc_quality/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install -r requirements.txt

# Set environment
Expand Down
6 changes: 3 additions & 3 deletions transforms/language/html2parquet/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

## Copy the python version of the tansform
COPY --chmod=g=u --chown=ray:root dpk_html2parquet/ dpk_html2parquet/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_html2parquet/ dpk_html2parquet/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install -r requirements.txt

# Set environment
Expand Down
6 changes: 3 additions & 3 deletions transforms/language/lang_id/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ USER ray

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]


COPY --chmod=g=u --chown=ray:root dpk_lang_id/ dpk_lang_id/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_lang_id/ dpk_lang_id/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install --no-cache-dir -r requirements.txt

# clean up apt
Expand Down
6 changes: 3 additions & 3 deletions transforms/language/pdf2parquet/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ RUN \

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]


## Copy the python version of the tansform
COPY --chmod=g=u --chown=ray:root dpk_pdf2parquet/ dpk_pdf2parquet/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_pdf2parquet/ dpk_pdf2parquet/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install ${PIP_INSTALL_EXTRA_ARGS} -r requirements.txt


Expand Down
2 changes: 1 addition & 1 deletion transforms/language/pii_redactor/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ARG DPK_WHEEL_FILE_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

## Copy the python version of the tansform
Expand Down
6 changes: 3 additions & 3 deletions transforms/language/text_encoder/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ ARG PIP_INSTALL_EXTRA_ARGS
ARG DPK_WHEEL_FILE_NAME
# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]

COPY --chmod=g=u --chown=ray:root dpk_text_encoder/ dpk_text_encoder/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_text_encoder/ dpk_text_encoder/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install ${PIP_INSTALL_EXTRA_ARGS} --no-cache-dir -r requirements.txt

# Set environment
Expand Down
6 changes: 3 additions & 3 deletions transforms/universal/doc_id/Dockerfile.ray
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ ARG TRANSFORM_NAME

# Copy and install data processing libraries
# These are expected to be placed in the docker context before this is run (see the make image).
COPY --chmod=g=u --chown=ray:root data-processing-dist data-processing-dist
COPY --chmod=775 --chown=ray:root data-processing-dist data-processing-dist
RUN pip install data-processing-dist/${DPK_WHEEL_FILE_NAME}[ray]


COPY --chmod=g=u --chown=ray:root dpk_${TRANSFORM_NAME}/ dpk_${TRANSFORM_NAME}/
COPY --chmod=g=u --chown=ray:root requirements.txt requirements.txt
COPY --chmod=775 --chown=ray:root dpk_${TRANSFORM_NAME}/ dpk_${TRANSFORM_NAME}/
COPY --chmod=775 --chown=ray:root requirements.txt requirements.txt
RUN pip install --no-cache-dir -r requirements.txt

# Set environment
Expand Down
Loading

0 comments on commit 6253bac

Please sign in to comment.