Skip to content

Commit 6d205ea

Browse files
committed
move dockerfile for backend
1 parent 5dbc026 commit 6d205ea

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ ci-test: install-deps-dev format-check lint test ## run CI tests
5252
# ---
5353
DOCKER_REPO_NAME ?= ks6088ts
5454
DOCKER_IMAGE_NAME ?= azure-ai-services-solutions
55-
DOCKER_IMAGE_COMPONENT ?= backend
55+
DOCKER_SERVICE_NAME ?= backend
5656
DOCKER_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
5959
DOCKER_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
9797
ci-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

dockerfiles/backend.Dockerfile renamed to backend/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.11.8-slim-bookworm as requirements-stage
1+
FROM python:3.11.8-slim-bookworm AS requirements-stage
22

33
WORKDIR /tmp
44

@@ -16,7 +16,7 @@ ARG GIT_TAG="x.x.x"
1616
WORKDIR /app
1717

1818
COPY --from=requirements-stage /tmp/requirements.txt /app/requirements.txt
19-
COPY . .
19+
COPY ./backend/ .
2020

2121
# Install dependencies
2222
RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt

compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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:

0 commit comments

Comments
 (0)