From 9bc8c6bf603e094e37f93c7a34d06a3e280ec299 Mon Sep 17 00:00:00 2001 From: b1ek Date: Thu, 29 Aug 2024 18:15:12 +1000 Subject: [PATCH] fix: switch to postgres --- .env.example | 8 ++++---- docker-compose.yml | 31 +++++++++++++++---------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.env.example b/.env.example index 2a4a8b7..3caa34e 100644 --- a/.env.example +++ b/.env.example @@ -12,16 +12,16 @@ APP_FAKER_LOCALE=en_US APP_MAINTENANCE_DRIVER=file # APP_MAINTENANCE_STORE=database -BCRYPT_ROUNDS=12 +BCRYPT_ROUNDS=16 LOG_CHANNEL=stack LOG_STACK=single LOG_DEPRECATIONS_CHANNEL=null LOG_LEVEL=debug -DB_CONNECTION=sqlite -# DB_HOST=127.0.0.1 -# DB_PORT=3306 +DB_CONNECTION=pgsql +# DB_HOST=psql +# DB_PORT=5432 # DB_DATABASE=laravel # DB_USERNAME=root # DB_PASSWORD= diff --git a/docker-compose.yml b/docker-compose.yml index 475e655..b5f8e70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,33 +22,32 @@ services: networks: - sail depends_on: - - mysql + - psql - redis - meilisearch - mailpit - selenium - mysql: - image: 'mysql/mysql-server:8.0' + psql: + image: postgres:16-alpine3.20 ports: - - '${FORWARD_DB_PORT:-3306}:3306' + - '${FORWARD_DB_PORT:-5432}:5432' environment: - MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' - MYSQL_ROOT_HOST: '%' - MYSQL_DATABASE: '${DB_DATABASE}' - MYSQL_USER: '${DB_USERNAME}' - MYSQL_PASSWORD: '${DB_PASSWORD}' - MYSQL_ALLOW_EMPTY_PASSWORD: 1 + POSTGRES_DB: '${DB_DATABASE}' + POSTGRES_USER: '${DB_USERNAME}' + POSTGRES_PASSWORD: '${DB_PASSWORD}' volumes: - - 'sail-mysql:/var/lib/mysql' - - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh' + - 'sail-postgresql:/var/lib/postgresql' networks: - sail healthcheck: test: - CMD - - mysqladmin - - ping - - '-p${DB_PASSWORD}' + - pg_isready + - -q + - -d + - '${DB_DATABASE}' + - '-U' + - '${DB_USERNAME}' retries: 3 timeout: 5s redis: @@ -104,7 +103,7 @@ networks: sail: driver: bridge volumes: - sail-mysql: + sail-postgresql: driver: local sail-redis: driver: local