Merge pull request #1370 from openclassify/fatihalp3

Fatihalp3

.env-sail

@@ -1,23 +1,23 @@
-APP_NAME=oc
+APP_NAME=oc
-APP_ENV=production
+APP_ENV=production
-INSTALLED="false"
+INSTALLED="false"
-APP_URL_TYPE="HTTP_X_FORWARDED_HOST" 
+APP_URL_TYPE="HTTP_X_FORWARDED_HOST" 
-APP_KEY=DYKEBxfEHK1PP4mUbP3gWPtsPZgXh0qX
+APP_KEY=DYKEBxfEHK1PP4mUbP3gWPtsPZgXh0qX
-APP_DEBUG=true
+APP_DEBUG=true
-DEBUG_BAR=true
+DEBUG_BAR=true
-DB_CONNECTION=mysql
+DB_CONNECTION=mysql
-#DB_HOST=mysql
+#DB_HOST=mysql
-DB_HOST=host.docker.internal
+DB_HOST=host.docker.internal
-DB_DATABASE=oc
+DB_DATABASE=oc
-DB_USERNAME=oc
+DB_USERNAME=oc
-DB_PASSWORD=oc
+DB_PASSWORD=oc
-APPLICATION_NAME=Default
+APPLICATION_NAME=Default
-APPLICATION_REFERENCE=default 
+APPLICATION_REFERENCE=default 
-ADMIN_USERNAME=admin
+ADMIN_USERNAME=admin
-ADMIN_EMAIL=admin@example.com
+ADMIN_EMAIL=admin@example.com
-ADMIN_PASSWORD=admin
+ADMIN_PASSWORD=admin
-APP_LOCALE=en
+APP_LOCALE=en
-APP_TIMEZONE=UTC
+APP_TIMEZONE=UTC
-REDIS_CLIENT=phpredis
+REDIS_CLIENT=phpredis
-REDIS_HOST=redis
+REDIS_HOST=redis
-REDIS_PORT=6379
+REDIS_PORT=6379

docker-compose.yml

@@ -1,87 +1,88 @@
-volumes:
+volumes:
-  db-store:
+  db-store:
-  psysh-store:
+  psysh-store:
-
+
-configs:
+configs:
-  db-config:
+  db-config:
-    file: ./docker/mysql/my.cnf
+    file: ./docker/mysql/my.cnf
-
+
-services:
+services:
-  php:
+  php:
-    build:
+    build:
-      context: .
+      context: .
-      dockerfile: ./docker/php/Dockerfile
+      dockerfile: ./docker/php/Dockerfile
-      target: ${APP_BUILD_TARGET:-development}
+      target: ${APP_BUILD_TARGET:-development}
-    container_name: oc_php
+    container_name: oc_php
-    volumes:
+    volumes:
-      - type: bind
+      - type: bind
-        source: ./
+        source: ./
-        target: /workspace
+        target: /workspace
-      - type: volume
+      - type: volume
-        source: psysh-store
+        source: psysh-store
-        target: /root/.config/psysh
+        target: /root/.config/psysh
-        volume:
+        volume:
-          nocopy: true
+          nocopy: true
-    depends_on:
+    depends_on:
-      database:
+      database:
-        condition: service_healthy
+        condition: service_healthy
-    extra_hosts:
+    extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - "host.docker.internal:host-gateway"
-
+
-  nginx:
+  nginx:
-    build:
+    build:
-      context: .
+      context: .
-      dockerfile: ./docker/nginx/Dockerfile
+      dockerfile: ./docker/nginx/Dockerfile
-    container_name: ${APP_NAME}_nginx  
+    container_name: ${APP_NAME}_nginx  
-    ports:
+    ports:
-      - target: 80
+      - target: 80
-        published: ${WEB_PUBLISHED_PORT:-80}
+        published: ${WEB_PUBLISHED_PORT:-80}
-        protocol: tcp
+        protocol: tcp
-        mode: host
+        mode: host
-    volumes:
+    volumes:
-      - type: bind
+      - type: bind
-        source: ./
+        source: ./
-        target: /workspace
+        target: /workspace
-    depends_on:
+    depends_on:
-      - php
+      - php
-      - database    
+      - database    
-
+
-  database:
+  database:
-    build:
+    build:
-      context: .
+      context: .
-      dockerfile: ./docker/mysql/Dockerfile
+      dockerfile: ./docker/mysql/Dockerfile
-    command: --max_allowed_packet=32505856      # Set max_allowed_packet to 256M (or any other value)  
+    command: --max_allowed_packet=32505856      # Set max_allowed_packet to 256M (or any other value)  
-    ports:
+    ports:
-      - target: 3306
+      - target: 3306
-        published: ${DB_PUBLISHED_PORT:-3306}
+        published: ${DB_PUBLISHED_PORT:-3306}
-        protocol: tcp
+        protocol: tcp
-        mode: host
+        mode: host
-    configs:
+    configs:
-      - source: db-config
+      - source: db-config
-        target: /etc/my.cnf
+        target: /etc/my.cnf
-    volumes:
+    volumes:
-      - type: volume
+      - type: volume
-        source: db-store
+        source: db-store
-        target: /var/lib/mysql
+        target: /var/lib/mysql
-        volume:
+        volume:
-          nocopy: true
+          nocopy: true
-    environment:
+    environment:
-      - MYSQL_DATABASE=${DB_DATABASE:-laravel}
+      - MYSQL_DATABASE=${DB_DATABASE:-laravel}
-      - MYSQL_USER=${DB_USERNAME:-phper}
+      - MYSQL_USER=${DB_USERNAME:-phper}
-      - MYSQL_PASSWORD=${DB_PASSWORD:-secret}
+      - MYSQL_PASSWORD=${DB_PASSWORD:-secret}
-      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD:-secret}
+      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD:-secret}
-    healthcheck:
+    healthcheck:
-        test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+        test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
-        timeout: 5s
+        timeout: 5s
-        retries: 10
+        retries: 10
-
+
-  phpmyadmin:
+  phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
+    image: phpmyadmin/phpmyadmin:latest
-    ports:
+    ports:
-      - "8081:80"
+      - "8081:80"
-    depends_on:
+    depends_on:
-      - database
+      - database
-    environment:
+    environment:
-      PMA_USER: oc
+      PMA_USER: oc
-      PMA_PASSWORD: oc
+      PMA_PASSWORD: oc
-      PMA_HOSTS: database,localhost
+      PMA_HOSTS: database,localhost
+      UPLOAD_LIMIT: 10G