Skip to content

Hf merge/text splitter build #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brosenberg42 merged 3 commits into from
Dec 4, 2024
Merged

Hf merge/text splitter build #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1af8c2
Install g++ when installing text splitter (#228)
brosenberg42 Dec 3, 2024
6904db2
Merge branch 'master' into hf-merge/text-splitter-build
brosenberg42 Dec 3, 2024
4561b5b
Fix interpolation issue in Jenkinsfile
brosenberg42 Dec 4, 2024
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
5 changes: 3 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,8 @@ try {

withEnv(["COMPOSE_FILE=$componentComposeFiles"]) {
def componentComposeYaml =
readYaml(text: shOutput('docker compose config --no-interpolate --no-consistency'))
readYaml(text: shOutput('docker compose config --no-interpolate ' +
'--no-consistency --no-path-resolution --no-normalize'))

if (env.docker_services_to_build) {
def searchImages = env.docker_services_to_build.split(',')
Expand Down Expand Up @@ -756,7 +757,7 @@ def dockerCleanUp() {
}
}
}

parallel stepsForParallel

sh 'docker builder prune --force --keep-storage=120GB'
Expand Down
11 changes: 10 additions & 1 deletion components/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,20 @@ ENV PATH $COMPONENT_VIRTUALENV/bin:/scripts:$PATH
#########################################
FROM common AS build_api

RUN --mount=type=tmpfs,target=/var/cache/apt \
--mount=type=tmpfs,target=/var/lib/apt/lists \
--mount=type=tmpfs,target=/tmp \
apt-get update; \
# Some pip packages will try to compile C/C++ extensions during install. To compile the C/C++
# extensions, a C++ compiler and the Python development headers must be installed.
apt-get install --no-install-recommends -y g++ python3.8-dev

RUN python3 -m venv "$COMPONENT_VIRTUALENV"; \
pip config --site set global.no-cache-dir true; \
pip install --upgrade pip; \
pip install --upgrade setuptools;

RUN --mount=from=openmpf_build,source=/home/mpf/openmpf-projects/openmpf-python-component-sdk/detection,target=/tmp/python \
RUN --mount=from=openmpf_build,source=/home/mpf/openmpf-projects/openmpf-python-component-sdk/detection,target=/tmp/python,rw \
pip3 install --no-cache-dir /tmp/python/api /tmp/python/component_util; \
python3 -m unittest discover --verbose --buffer --start-directory /tmp/python/component_util/tests

Expand Down