yujunjun/haystack
1
0
Fork 0
mirror of https://github.com/deepset-ai/haystack.git synced 2025-08-19 14:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(docker): Use IMAGE_NAME in api image (#3786)

Browse Source 
If you set the IMAGE_NAME variable, then the base image will use that name,
but the api image would previously use a hardcoded `deepset/haystack` image name.
This commit is contained in:
Fabian 2023-01-03 12:26:26 +01:00 committed by GitHub
parent 434beebfb1
commit e53cc2bc3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/Dockerfile.api
View File

@ -1,6 +1,7 @@
ARG base_image_tag ARG base_image_tag
ARG base_image
FROM deepset/haystack:${base_image_tag} FROM ${base_image}:${base_image_tag}
ENV SERVICE_NAME="gunicorn-service" ENV SERVICE_NAME="gunicorn-service"

2
docker/docker-bake.hcl
View File

@ -68,6 +68,7 @@ target "cpu" {
dockerfile = "Dockerfile.api" dockerfile = "Dockerfile.api"
tags = ["${IMAGE_NAME}:cpu-${IMAGE_TAG_SUFFIX}"] tags = ["${IMAGE_NAME}:cpu-${IMAGE_TAG_SUFFIX}"]
args = { args = {
base_image = "${IMAGE_NAME}"
base_image_tag = "base-cpu-${BASE_IMAGE_TAG_SUFFIX}" base_image_tag = "base-cpu-${BASE_IMAGE_TAG_SUFFIX}"
} }
platforms = ["linux/amd64", "linux/arm64"] platforms = ["linux/amd64", "linux/arm64"]
@ -83,6 +84,7 @@ target "gpu" {
dockerfile = "Dockerfile.api" dockerfile = "Dockerfile.api"
tags = ["${IMAGE_NAME}:gpu-${IMAGE_TAG_SUFFIX}"] tags = ["${IMAGE_NAME}:gpu-${IMAGE_TAG_SUFFIX}"]
args = { args = {
base_image = "${IMAGE_NAME}"
base_image_tag = "base-gpu-${BASE_IMAGE_TAG_SUFFIX}" base_image_tag = "base-gpu-${BASE_IMAGE_TAG_SUFFIX}"
} }
platforms = ["linux/amd64", "linux/arm64"] platforms = ["linux/amd64", "linux/arm64"]