Skip to content

Commit 7866cd5

Browse files
committed
make pipelines-dir and additional-python-path pluggable
1 parent 3dd005a commit 7866cd5

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

docker/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,16 @@ FROM $base_image AS final
2626

2727
COPY --from=build-image /opt/venv /opt/venv
2828

29+
ARG pipelines_dir
30+
RUN mkdir -p $pipelines_dir
31+
ENV HAYHOOKS_PIPELINES_DIR=$pipelines_dir
32+
33+
ARG additional_python_path
34+
RUN mkdir -p $additional_python_path
35+
ENV HAYHOOKS_ADDITIONAL_PYTHONPATH=$additional_python_path
36+
2937
EXPOSE 1416
3038

3139
ENV PATH="/opt/venv/bin:$PATH"
3240

33-
CMD ["hayhooks", "run", "--host", "0.0.0.0", "--port", "1416"]
41+
CMD ["hayhooks", "run", "--host", "0.0.0.0"]

docker/docker-bake.hcl

+8-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ variable "HAYHOOKS_VERSION" {
22
default = "main"
33
}
44

5-
variable "GITHUB_REF" {
6-
default = ""
7-
}
8-
95
variable "IMAGE_NAME" {
106
default = "deepset/hayhooks"
117
}
@@ -14,8 +10,12 @@ variable "IMAGE_TAG_SUFFIX" {
1410
default = "local"
1511
}
1612

17-
variable "BASE_IMAGE_TAG_SUFFIX" {
18-
default = "local"
13+
variable "PIPELINES_DIR" {
14+
default = "/opt/pipelines"
15+
}
16+
17+
variable "ADDITIONAL_PYTHON_PATH" {
18+
default = "/opt/custom-components"
1919
}
2020

2121
target "default" {
@@ -25,6 +25,8 @@ target "default" {
2525
build_image = "deepset/haystack:base-main"
2626
base_image = "deepset/haystack:base-main"
2727
hayhooks_version = "${HAYHOOKS_VERSION}"
28+
pipelines_dir = "${PIPELINES_DIR}"
29+
additional_python_path = "${ADDITIONAL_PYTHON_PATH}"
2830
}
2931
platforms = ["linux/amd64", "linux/arm64"]
3032
}

0 commit comments

Comments
 (0)