diff --git a/.env.save b/.env.save index 77727d3..91f97be 100644 --- a/.env.save +++ b/.env.save @@ -21,7 +21,7 @@ LOG_DEPRECATIONS_CHANNEL=null LOG_LEVEL=debug DB_CONNECTION=mysql -DB_HOST=127.0.0.1 +DB_HOST=db DB_PORT=3306 DB_DATABASE=humicpro_cetaksuratkp DB_USERNAME=humicpro_cetaksuratkp diff --git a/docker-compose.yml b/docker-compose.yml index 7e611ec..e67fc75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,9 +14,9 @@ services: APP_DEBUG: ${APP_DEBUG:-false} APP_URL: ${APP_URL} - DB_CONNECTION: pgsql + DB_CONNECTION: mariadb DB_HOST: db - DB_PORT: 5432 + DB_PORT: 3306 DB_DATABASE: ${DB_DATABASE} DB_USERNAME: ${DB_USERNAME} @@ -45,19 +45,20 @@ services: - app # ========================================== - # 3. Database (Custom PostgreSQL) + # 3. Database (MariaDB) # ========================================== db: build: context: . - dockerfile: docker/postgres.Dockerfile + dockerfile: docker/mariadb.Dockerfile restart: unless-stopped environment: - POSTGRES_DB: ${DB_DATABASE} - POSTGRES_USER: ${DB_USERNAME} - POSTGRES_PASSWORD: ${DB_PASSWORD} + MYSQL_DATABASE: ${DB_DATABASE} + MYSQL_USER: ${DB_USERNAME} + MYSQL_PASSWORD: ${DB_PASSWORD} + MYSQL_ROOT_PASSWORD: ${DB_PASSWORD} volumes: - - db_data:/var/lib/postgresql/data + - db_data:/var/lib/mysql volumes: db_data: diff --git a/docker/Dockerfile b/docker/Dockerfile index 0124c0a..e19924b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,10 +28,9 @@ RUN apk add --no-cache \ unzip \ git \ oniguruma-dev \ - postgresql-dev \ $PHPIZE_DEPS \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install pdo pdo_pgsql mbstring zip exif pcntl gd opcache + && docker-php-ext-install pdo pdo_mysql mbstring zip exif pcntl gd opcache COPY docker/opcache.ini /usr/local/etc/php/conf.d/opcache.ini diff --git a/docker/postgres.Dockerfile b/docker/mariadb.Dockerfile similarity index 73% rename from docker/postgres.Dockerfile rename to docker/mariadb.Dockerfile index faf8d3e..ab5693d 100644 --- a/docker/postgres.Dockerfile +++ b/docker/mariadb.Dockerfile @@ -1,3 +1,3 @@ -FROM postgres:15-alpine +FROM mariadb:10.6 COPY docker/humicpro_cetaksuratkp.sql /docker-entrypoint-initdb.d/