Skip to content

Commit 3581f54

Browse files
committed
✨ Use docker-compose for dev env
1 parent 035b48a commit 3581f54

File tree

4 files changed

+11
-34
lines changed

4 files changed

+11
-34
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ scripts/importOldData.py
1616
scripts/old-data/
1717
created-users.json
1818
public/version.json
19+
mysql

Diff for: docker-compose.yml

+9-33
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,15 @@
1-
version: '3.9'
21
services:
3-
loca7:
4-
container_name: loca7
5-
env_file:
6-
- .env
2+
mysql:
3+
image: mysql
74
environment:
8-
DATABASE_URL: postgresql://ewen:root@db:5432/loca7
9-
build: .
5+
MYSQL_ROOT_PASSWORD: root
6+
MYSQL_DATABASE: loca7
7+
MYSQL_USER: loca
8+
MYSQL_PASSWORD: root
109
ports:
11-
- '3000:3000'
12-
depends_on: [db]
13-
db:
14-
container_name: db
15-
environment:
16-
POSTGRES_USER: ewen
17-
POSTGRES_PASSWORD: root
18-
POSTGRES_DB: loca7
19-
PGDATA: /data/postgres
20-
image: postgres:latest
21-
volumes:
22-
- postgres:/data/postgres
23-
pgadmin:
24-
container_name: pgadmin
25-
image: dpage/pgadmin4:latest
26-
environment:
27-
PGADMIN_DEFAULT_EMAIL: [email protected]
28-
PGADMIN_DEFAULT_PASSWORD: root
29-
PGADMIN_LISTEN_PORT: 80
30-
ports:
31-
- 5000:80
32-
depends_on:
33-
- db
10+
- "3306:3306"
3411
volumes:
35-
- pgadmin:/var/lib/pgadmin
12+
- ./mysql:/var/lib/mysql
3613

3714
volumes:
38-
postgres:
39-
pgadmin:
15+
mysql:

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"private": true,
55
"scripts": {
6-
"dev": "vite dev",
6+
"dev": "docker compose up -d && vite dev",
77
"mailhog": "mailhog -auth-file mailhog/auth -outgoing-smtp mailhog/outgoing.json",
88
"build": "vite build",
99
"preview": "vite preview",

Diff for: presentation.png

596 KB
Loading

0 commit comments

Comments
 (0)