File tree Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -52,10 +52,10 @@ ci-test: install-deps-dev format-check lint test ## run CI tests
5252# ---
5353DOCKER_REPO_NAME ?= ks6088ts
5454DOCKER_IMAGE_NAME ?= azure-ai-services-solutions
55- DOCKER_IMAGE_COMPONENT ?= backend
55+ DOCKER_SERVICE_NAME ?= backend
5656DOCKER_COMMAND ?=
57- DOCKER_TAG ?= $(DOCKER_IMAGE_COMPONENT ) -$(GIT_TAG )
58- DOCKER_FILE ?= ./dockerfiles/ $( DOCKER_IMAGE_COMPONENT ) . Dockerfile
57+ DOCKER_TAG ?= $(DOCKER_SERVICE_NAME ) -$(GIT_TAG )
58+ DOCKER_FILE ?= ./$( DOCKER_SERVICE_NAME ) / Dockerfile
5959DOCKER_COMPOSE_FILE ?= ./compose.yaml
6060
6161# Tools
@@ -95,8 +95,8 @@ _ci-test-docker: docker-lint docker-build docker-scan docker-run
9595
9696.PHONY : ci-test-docker
9797ci-test-docker : docker-compose-lint # # run CI test for Docker
98- $(MAKE ) _ci-test-docker DOCKER_IMAGE_COMPONENT =backend
99- $(MAKE ) _ci-test-docker DOCKER_IMAGE_COMPONENT =frontend
98+ $(MAKE ) _ci-test-docker DOCKER_SERVICE_NAME =backend
99+ $(MAKE ) _ci-test-docker DOCKER_SERVICE_NAME =frontend
100100
101101# ---
102102# Application
Original file line number Diff line number Diff line change 1- FROM python:3.11.8-slim-bookworm as requirements-stage
1+ FROM python:3.11.8-slim-bookworm AS requirements-stage
22
33WORKDIR /tmp
44
@@ -16,7 +16,7 @@ ARG GIT_TAG="x.x.x"
1616WORKDIR /app
1717
1818COPY --from=requirements-stage /tmp/requirements.txt /app/requirements.txt
19- COPY . .
19+ COPY ./backend/ .
2020
2121# Install dependencies
2222RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
Original file line number Diff line number Diff line change @@ -2,13 +2,13 @@ services:
22 backend :
33 build :
44 context : .
5- dockerfile : dockerfiles/ backend. Dockerfile
5+ dockerfile : backend/ Dockerfile
66 image : ks6088ts/azure-ai-services-solutions:backend-latest
77 command : python main.py backend --port 8888
88 ports :
99 - 8888:8888
1010 volumes :
11- - ./settings :/app/settings
11+ - ./backend :/app/
1212 environment :
1313 - PYTHONUNBUFFERED=1
1414 frontend :
You can’t perform that action at this time.
0 commit comments