Skip to content

Commit

Permalink
refactor: remap ports (jsdelivr/globalping#517)
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinKolarik committed Apr 21, 2024
1 parent 03f2b03 commit 49b987d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- MARIADB_PASSWORD=password
- MARIADB_ROOT_PASSWORD=root
ports:
- "3306:3306"
- "13306:3306"
volumes:
- ./config/init.sql:/docker-entrypoint-initdb.d/init.sql
healthcheck:
Expand All @@ -26,4 +26,4 @@ services:
env_file:
- .env.development
ports:
- "8055:8055"
- "18055:8055"
10 changes: 5 additions & 5 deletions knexfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ export default _.merge({}, ...[ 'development' ].map((environment) => {
[environment]: {
client: 'mysql',
connection: {
host: 'localhost',
user: 'directus',
password: 'password',
database: 'directus',
port: 3306,
host: process.env.DB_HOST || 'localhost',
user: process.env.DB_USER || 'directus',
password: process.env.DB_PASSWORD || 'password',
database: process.env.DB_DATABSE || 'directus',
port: process.env.DB_PORT || 13306,
},
pool: {
min: 0,
Expand Down
2 changes: 1 addition & 1 deletion scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if [ "$is_dev_mode" = true ]; then

docker compose up -d globalping-dash-directus

./scripts/wait-for.sh -t 60 http://localhost:8055/admin/login
./scripts/wait-for.sh -t 60 $DIRECTUS_URL/admin/login

npm run seed
else
Expand Down

0 comments on commit 49b987d

Please sign in to comment.