Skip to content

Commit eac251f

Browse files
authored
docs: Use docker compose v2 and update MYSQL_DATABASE env var (sqlc-dev#2870)
* patch: use docker compose v2 and update MYSQL_DATABASE evn var * patch: dinotest is default
1 parent 167555e commit eac251f

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sqlc-gen-json:
3333
go build -o ~/bin/sqlc-gen-json ./cmd/sqlc-gen-json
3434

3535
start:
36-
docker-compose up -d
36+
docker compose up -d
3737

3838
fmt:
3939
go fmt ./...

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
- "3306:3306"
77
restart: always
88
environment:
9-
MYSQL_DATABASE: mysql
9+
MYSQL_DATABASE: dinotest
1010
MYSQL_ROOT_PASSWORD: mysecretpassword
1111
MYSQL_ROOT_HOST: '%'
1212

@@ -16,7 +16,7 @@ services:
1616
- "3305:3306"
1717
restart: always
1818
environment:
19-
MYSQL_DATABASE: mysql
19+
MYSQL_DATABASE: dinotest
2020
MYSQL_ROOT_PASSWORD: mysecretpassword
2121
MYSQL_ROOT_HOST: '%'
2222
profiles:

docs/guides/development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ These tests require locally-running database instances. Run these databases
2424
using [Docker Compose](https://docs.docker.com/compose/).
2525

2626
```
27-
docker-compose up -d
27+
docker compose up -d
2828
```
2929

3030
The tests use the following environment variables to connect to the

go.sum

-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ github.com/jackc/pgx/v5 v5.4.3/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSlj
100100
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
101101
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
102102
github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
103-
github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
104103
github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
105104
github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
106105
github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
@@ -140,8 +139,6 @@ github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c h1:CgbKAHto5CQgW
140139
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c/go.mod h1:4qGtCB0QK0wBzKtFEGDhxXnSnbQApw1gc9siScUl8ew=
141140
github.com/pingcap/log v1.1.0 h1:ELiPxACz7vdo1qAvvaWJg1NrYFoY6gqAh/+Uo6aXdD8=
142141
github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
143-
github.com/pingcap/tidb/parser v0.0.0-20230815160630-b69fa21942d1 h1:FvX5fDJ32eblK9f6KJIOVujjtu3FDEfcRGHsEDfJ4kI=
144-
github.com/pingcap/tidb/parser v0.0.0-20230815160630-b69fa21942d1/go.mod h1:pWA6mNa/o7UTDKrg+4H75NdpRgpWRTox/cqQjaQ4ZBU=
145142
github.com/pingcap/tidb/parser v0.0.0-20231010133155-38cb4f3312be h1:4HUBkIZs+4j+tbXGm5/B0yjB66OTz218HDKA6VrhO7U=
146143
github.com/pingcap/tidb/parser v0.0.0-20231010133155-38cb4f3312be/go.mod h1:cwq4bKUlftpWuznB+rqNwbN0xy6/i5SL/nYvEKeJn4s=
147144
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

0 commit comments

Comments
 (0)