From 69adc800eb4a43c6bd4cf012120ce0a740afeb0b Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Mon, 27 May 2024 09:09:11 +0200 Subject: [PATCH] Use latest docker compose version and fix version warning --- Makefile | 2 +- docker-compose.yml | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index beed764e..43098b04 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash DOCKER := $(shell type -p docker) -DC := $(shell type -p docker-compose) +DC := ${DOCKER} compose TAG := 3.3 APP_NAME := basegun REG := ghcr.io diff --git a/docker-compose.yml b/docker-compose.yml index 4769b4ab..fb245b81 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.8' services: backend: build: @@ -23,10 +22,9 @@ services: ports: - 5000:5000 volumes: - - $PWD/backend/src:/app/src - - $PWD/backend/tests:/app/tests - - $PWD/backend/logs:/tmp/logs - - /app/src/weights + - ./backend/src:/app/src + - ./backend/tests:/app/tests + - ./backend/logs:/tmp/logs frontend: build: @@ -42,7 +40,7 @@ services: - 8080:80 # if BUILD_TARGET = prod - 3000:5173 volumes: - - $PWD/frontend/src:/app/src + - ./frontend/src:/app/src - /app/node_modules minio: