Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 21 additions & 20 deletions src/datacustomcode/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import json
import os
import shutil
import tarfile
import tempfile
import time
from typing import (
Expand Down Expand Up @@ -140,8 +139,13 @@ def create_deployment(
raise


DOCKER_IMAGE_NAME = "datacloud-custom-code"
DEPENDENCIES_ARCHIVE_NAME = "dependencies.tar.gz"
PLATFORM_ENV_VAR = "DOCKER_DEFAULT_PLATFORM=linux/amd64"
DOCKER_IMAGE_NAME = "datacloud-custom-code-dependency-builder"
DEPENDENCIES_ARCHIVE_NAME = "native_dependencies"
DEPENDENCIES_ARCHIVE_FULL_NAME = f"{DEPENDENCIES_ARCHIVE_NAME}.tar.gz"
DEPENDENCIES_ARCHIVE_PATH = os.path.join(
"payload", "archives", DEPENDENCIES_ARCHIVE_FULL_NAME
)
ZIP_FILE_NAME = "deployment.zip"


Expand All @@ -150,31 +154,28 @@ def prepare_dependency_archive(directory: str) -> None:
image_exists = cmd_output(cmd)

if not image_exists:
logger.debug("Building docker image...")
cmd = f"docker build -t {DOCKER_IMAGE_NAME} ."
logger.info("Building docker image...")
cmd = (
f"{PLATFORM_ENV_VAR} docker build -t {DOCKER_IMAGE_NAME} "
f"-f Dockerfile.dependencies ."
)
cmd_output(cmd)

with tempfile.TemporaryDirectory() as temp_dir:
logger.info("Building dependencies archive")
shutil.copy("requirements.txt", temp_dir)
shutil.copy("build_native_dependencies.sh", temp_dir)
cmd = (
f"docker run --rm "
f"-v {temp_dir}:/dependencies "
f"{DOCKER_IMAGE_NAME} "
f'/bin/bash -c "cd /dependencies && pip download -r requirements.txt"'
f"{PLATFORM_ENV_VAR} docker run --rm "
f"-v {temp_dir}:/workspace "
f"{DOCKER_IMAGE_NAME}"
)
cmd_output(cmd)
archives_temp_path = os.path.join(temp_dir, DEPENDENCIES_ARCHIVE_FULL_NAME)
os.makedirs(os.path.dirname(DEPENDENCIES_ARCHIVE_PATH), exist_ok=True)
shutil.copy(archives_temp_path, DEPENDENCIES_ARCHIVE_PATH)

archives_dir = os.path.join(directory, "archives")
os.makedirs(archives_dir, exist_ok=True)
archive_file = os.path.join(archives_dir, DEPENDENCIES_ARCHIVE_NAME)
with tarfile.open(archive_file, "w:gz") as tar:
for file in os.listdir(temp_dir):
# Exclude requirements.txt from the archive
if file == "requirements.txt":
continue
tar.add(os.path.join(temp_dir, file), arcname=file)

logger.debug(f"Dependencies downloaded and archived to {archive_file}")
logger.info(f"Dependencies archived to {DEPENDENCIES_ARCHIVE_PATH}")


class DeploymentsResponse(BaseModel):
Expand Down
11 changes: 11 additions & 0 deletions src/datacustomcode/templates/Dockerfile.dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM public.ecr.aws/emr-on-eks/spark/emr-7.3.0:latest

USER root

RUN pip3.11 install venv-pack

# Create workspace directory
RUN mkdir /workspace
WORKDIR /workspace

CMD ["./build_native_dependencies.sh"]
8 changes: 8 additions & 0 deletions src/datacustomcode/templates/build_native_dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

# Description: build native dependencies

python3.11 -m venv --copies .venv
source .venv/bin/activate
pip install -r requirements.txt
venv-pack -o native_dependencies.tar.gz -f
Loading