Skip to content

Commit 5096293

Browse files
committed
fix docker compose, add logging
1 parent b816cea commit 5096293

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,30 @@
2020
DOCKER_COMPOSE_ARGS=--project-name msc-wis2node --file docker-compose.yml --file docker-compose.override.yml
2121

2222
build:
23-
sudo docker compose $(DOCKER_COMPOSE_ARGS) build
23+
docker compose $(DOCKER_COMPOSE_ARGS) build
2424

2525
force-build:
26-
sudo docker compose $(DOCKER_COMPOSE_ARGS) build --no-cache
26+
docker compose $(DOCKER_COMPOSE_ARGS) build --no-cache
2727

2828
up:
29-
sudo docker compose $(DOCKER_COMPOSE_ARGS) up
29+
docker compose $(DOCKER_COMPOSE_ARGS) up
3030

3131
down:
32-
sudo docker compose $(DOCKER_COMPOSE_ARGS) down
32+
docker compose $(DOCKER_COMPOSE_ARGS) down
3333

3434
restart: down up
3535

3636
login:
3737
docker exec -it msc-wis2node-management /bin/bash
3838

3939
dev:
40-
sudo docker compose $(DOCKER_COMPOSE_ARGS) --file docker-compose.dev.yml up
40+
docker compose $(DOCKER_COMPOSE_ARGS) --file docker-compose.dev.yml up
4141

4242
reinit-backend:
4343
docker exec -it msc-wis2node-management sh -c "msc-wis2node setup --force"
4444

4545
logs:
46-
sudo docker compose $(DOCKER_COMPOSE_ARGS) logs --follow
46+
docker compose $(DOCKER_COMPOSE_ARGS) logs --follow
4747

4848
clean:
4949
docker system prune -f

docker-compose.yml

+12
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,24 @@
1717
#
1818
###############################################################################
1919

20+
x-logging: &logging
21+
logging:
22+
driver: json-file
23+
options:
24+
mode: non-blocking
25+
max-buffer-size: 100m
26+
max-size: 10m
27+
max-file: 1
28+
2029
services:
2130
msc-wis2node-cache:
2231
image: memcached:latest
2332
container_name: msc-wis2node-cache
2433
env_file:
2534
- msc-wis2node.env
2635
restart: unless-stopped
36+
<<: *logging
37+
2738
msc-wis2node-management:
2839
image: msc-wis2node-management
2940
container_name: msc-wis2node
@@ -32,3 +43,4 @@ services:
3243
env_file:
3344
- msc-wis2node.env
3445
restart: unless-stopped
46+
<<: *logging

0 commit comments

Comments
 (0)