Skip to content

Commit

Permalink
refactor: rename redis to mem and set tmp vol
Browse files Browse the repository at this point in the history
  • Loading branch information
geoje committed Nov 18, 2024
1 parent ab4d95f commit b5cdeea
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
1 change: 0 additions & 1 deletion backend/docker/.env

This file was deleted.

17 changes: 9 additions & 8 deletions backend/docker/docker-compose-local.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
name: mapletool

volumes:
redis:
db:

services:
redis:
mem:
image: redis:alpine
restart: unless-stopped
restart: on-failure:3
ports:
- "6379:6379"
volumes:
- redis:/data
- 6379:6379
tmpfs:
- /data

db:
image: mysql:8.0
restart: unless-stopped
restart: on-failure:3
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: maple
LANG: C.UTF-8
ports:
- "3306:3306"
- 3306:3306
volumes:
- db:/var/lib/mysql
command:
Expand Down
16 changes: 8 additions & 8 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ networks:
name: traefik

volumes:
redis:
db:

services:
fe:
image: nginx:alpine
restart: unless-stopped
restart: on-failure:3
volumes:
- ./frontend/dist:/usr/share/nginx/html
labels:
Expand Down Expand Up @@ -40,7 +39,7 @@ services:
be:
image: openjdk:21-jdk-slim
restart: unless-stopped
restart: on-failure:3
environment:
SPRING_PROFILES_ACTIVE: prod
JASYPT_PASSWORD: ${JASYPT_PASSWORD}
Expand All @@ -59,21 +58,22 @@ services:
working_dir: /opt
entrypoint: ["java", "-jar", "mapletool.jar"]

redis:
mem:
image: redis:alpine
restart: unless-stopped
volumes:
- redis:/data
restart: on-failure:3
tmpfs:
- /data

db:
image: mysql:8.0
restart: unless-stopped
restart: on-failure:3
environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: maple
LANG: C.UTF-8
volumes:
- db:/var/lib/mysql
- ./db:/var/run/mysqld
command:
- --character-set-server=utf8mb4
- --collation-server=utf8mb4_general_ci
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dev": "start http://localhost:5173 && vite",
"build": "tsc && vite build",
"deploy": "git checkout main && git pull && git merge dev && git push && git checkout dev",
"lint": "eslint .",
"lint": "eslint .",
"preview": "vite preview"
},
"dependencies": {
Expand Down

0 comments on commit b5cdeea

Please sign in to comment.