From 050bca13e5ac7cadde0ea2188db6afc56cab4f31 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Tue, 1 Aug 2023 20:50:53 +0300 Subject: [PATCH 1/2] Introduce end-of-line normalization --- .env-sail | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.env-sail b/.env-sail index 6556227c9..252e1e12a 100644 --- a/.env-sail +++ b/.env-sail @@ -1,23 +1,23 @@ -APP_NAME=oc -APP_ENV=production -INSTALLED="false" -APP_URL_TYPE="HTTP_X_FORWARDED_HOST" -APP_KEY=DYKEBxfEHK1PP4mUbP3gWPtsPZgXh0qX -APP_DEBUG=true -DEBUG_BAR=true -DB_CONNECTION=mysql -#DB_HOST=mysql -DB_HOST=host.docker.internal -DB_DATABASE=oc -DB_USERNAME=oc -DB_PASSWORD=oc -APPLICATION_NAME=Default -APPLICATION_REFERENCE=default -ADMIN_USERNAME=admin -ADMIN_EMAIL=admin@example.com -ADMIN_PASSWORD=admin -APP_LOCALE=en -APP_TIMEZONE=UTC -REDIS_CLIENT=phpredis -REDIS_HOST=redis -REDIS_PORT=6379 +APP_NAME=oc +APP_ENV=production +INSTALLED="false" +APP_URL_TYPE="HTTP_X_FORWARDED_HOST" +APP_KEY=DYKEBxfEHK1PP4mUbP3gWPtsPZgXh0qX +APP_DEBUG=true +DEBUG_BAR=true +DB_CONNECTION=mysql +#DB_HOST=mysql +DB_HOST=host.docker.internal +DB_DATABASE=oc +DB_USERNAME=oc +DB_PASSWORD=oc +APPLICATION_NAME=Default +APPLICATION_REFERENCE=default +ADMIN_USERNAME=admin +ADMIN_EMAIL=admin@example.com +ADMIN_PASSWORD=admin +APP_LOCALE=en +APP_TIMEZONE=UTC +REDIS_CLIENT=phpredis +REDIS_HOST=redis +REDIS_PORT=6379 From bac028312a895afbb6a97a3d32361fb8776a83c3 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Sat, 5 Aug 2023 16:33:38 +0300 Subject: [PATCH 2/2] Change end of lines --- docker-compose.yml | 175 +++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 87 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 84116cd93..316c05b70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,87 +1,88 @@ -volumes: - db-store: - psysh-store: - -configs: - db-config: - file: ./docker/mysql/my.cnf - -services: - php: - build: - context: . - dockerfile: ./docker/php/Dockerfile - target: ${APP_BUILD_TARGET:-development} - container_name: oc_php - volumes: - - type: bind - source: ./ - target: /workspace - - type: volume - source: psysh-store - target: /root/.config/psysh - volume: - nocopy: true - depends_on: - database: - condition: service_healthy - extra_hosts: - - "host.docker.internal:host-gateway" - - nginx: - build: - context: . - dockerfile: ./docker/nginx/Dockerfile - container_name: ${APP_NAME}_nginx - ports: - - target: 80 - published: ${WEB_PUBLISHED_PORT:-80} - protocol: tcp - mode: host - volumes: - - type: bind - source: ./ - target: /workspace - depends_on: - - php - - database - - database: - build: - context: . - dockerfile: ./docker/mysql/Dockerfile - command: --max_allowed_packet=32505856 # Set max_allowed_packet to 256M (or any other value) - ports: - - target: 3306 - published: ${DB_PUBLISHED_PORT:-3306} - protocol: tcp - mode: host - configs: - - source: db-config - target: /etc/my.cnf - volumes: - - type: volume - source: db-store - target: /var/lib/mysql - volume: - nocopy: true - environment: - - MYSQL_DATABASE=${DB_DATABASE:-laravel} - - MYSQL_USER=${DB_USERNAME:-phper} - - MYSQL_PASSWORD=${DB_PASSWORD:-secret} - - MYSQL_ROOT_PASSWORD=${DB_PASSWORD:-secret} - healthcheck: - test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] - timeout: 5s - retries: 10 - - phpmyadmin: - image: phpmyadmin/phpmyadmin:latest - ports: - - "8081:80" - depends_on: - - database - environment: - PMA_USER: oc - PMA_PASSWORD: oc - PMA_HOSTS: database,localhost \ No newline at end of file +volumes: + db-store: + psysh-store: + +configs: + db-config: + file: ./docker/mysql/my.cnf + +services: + php: + build: + context: . + dockerfile: ./docker/php/Dockerfile + target: ${APP_BUILD_TARGET:-development} + container_name: oc_php + volumes: + - type: bind + source: ./ + target: /workspace + - type: volume + source: psysh-store + target: /root/.config/psysh + volume: + nocopy: true + depends_on: + database: + condition: service_healthy + extra_hosts: + - "host.docker.internal:host-gateway" + + nginx: + build: + context: . + dockerfile: ./docker/nginx/Dockerfile + container_name: ${APP_NAME}_nginx + ports: + - target: 80 + published: ${WEB_PUBLISHED_PORT:-80} + protocol: tcp + mode: host + volumes: + - type: bind + source: ./ + target: /workspace + depends_on: + - php + - database + + database: + build: + context: . + dockerfile: ./docker/mysql/Dockerfile + command: --max_allowed_packet=32505856 # Set max_allowed_packet to 256M (or any other value) + ports: + - target: 3306 + published: ${DB_PUBLISHED_PORT:-3306} + protocol: tcp + mode: host + configs: + - source: db-config + target: /etc/my.cnf + volumes: + - type: volume + source: db-store + target: /var/lib/mysql + volume: + nocopy: true + environment: + - MYSQL_DATABASE=${DB_DATABASE:-laravel} + - MYSQL_USER=${DB_USERNAME:-phper} + - MYSQL_PASSWORD=${DB_PASSWORD:-secret} + - MYSQL_ROOT_PASSWORD=${DB_PASSWORD:-secret} + healthcheck: + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] + timeout: 5s + retries: 10 + + phpmyadmin: + image: phpmyadmin/phpmyadmin:latest + ports: + - "8081:80" + depends_on: + - database + environment: + PMA_USER: oc + PMA_PASSWORD: oc + PMA_HOSTS: database,localhost + UPLOAD_LIMIT: 10G \ No newline at end of file