Sfoglia il codice sorgente

Changed debug mode

Alexander Musikhin 11 mesi fa
parent
commit
3092429054
4 ha cambiato i file con 26 aggiunte e 12 eliminazioni
  1. 3 9
      Makefile
  2. 21 2
      docker-compose.debug.yml
  3. 1 0
      docker/nginx/Dockerfile
  4. 1 1
      resources/views/home.blade.php

+ 3 - 9
Makefile

@@ -58,7 +58,7 @@ upgrade: stop pull up-rebuild composer-install db-migrate frontend-build ## Об
 	$(call message,"The application was successfully updated!")
 
 full-upgrade: stop pull up-rebuild composer-install db-migrate-refresh frontend-build ## Обновление приложения и пересоздание БД
-	$(call message,"The application was successfully updated! Database rebuilded!")
+	$(call message,"The application was successfully updated! Database rebuilt!")
 
 up: ## Запуск проекта
 	$(compose) up -d
@@ -90,14 +90,8 @@ up-rebuild: ## Перестройка проекта
 ps: ## Список запущенных контейнеров
 	$(compose) ps
 
-#icons: ## Перестроить иконки
-# 	$(webserver) sh -c 'apk add yarn && cd /var/frontend && yarn run icons'
-#
-#frontend-run: ## Перестроить фронт приложения
-#	$(webserver) sh -c 'apk add yarn && cd /var/frontend && yarn run build'
-#
-#frontend-build: ## Перестроить фронт приложения
-#	$(webserver) sh -c 'apk add yarn && cd /var/frontend && yarn install && yarn run build'
+frontend-build: ## Перестроить фронт приложения
+	$(webserver) sh -c 'npm install && npm run build'
 
 composer: ## Запуск composer
 	$(application) composer $(args)

+ 21 - 2
docker-compose.debug.yml

@@ -1,4 +1,5 @@
 services:
+    # App service ------------------------------------------------------------------------------------------------------
     app:
         volumes: !override
             - ./:/var/www
@@ -6,9 +7,8 @@ services:
             - ./storage/logs/php:/var/log/php8
         environment:
             PHP_IDE_CONFIG: serverName=_
-        ports:
-            - 5172:5173
 
+    # Queue service ----------------------------------------------------------------------------------------------------
     app-queue:
         volumes: !override
             - ./:/var/www
@@ -17,10 +17,29 @@ services:
         environment:
             PHP_IDE_CONFIG: serverName=_
 
+    # Vite Service ----------------------------------------------------------------------------------------------------
+    vite:
+        build:
+            context: .
+            dockerfile: docker/nginx/Dockerfile
+        restart: unless-stopped
+        tty: true
+        command: '/bin/sh -c ''npm run dev'''
+        ports:
+            - 5172:5172
+        volumes:
+            - ./public:/var/frontend
+            - ./:/var/www
+            - ./docker/nginx/conf.d/:/etc/nginx/conf.d/
+        networks:
+            - cpa-network
+
+    # Database service -------------------------------------------------------------------------------------------------
     db:
         ports:
             - ${DB_EXT_PORT}:3306
 
+    # Websocket service ------------------------------------------------------------------------------------------------
     websocket:
         command: '/bin/sh -c ''node --inspect=0.0.0.0:9229 server'''
         ports: !override

+ 1 - 0
docker/nginx/Dockerfile

@@ -1,5 +1,6 @@
 FROM nginx:alpine
 
 RUN apk add nodejs && apk add npm
+RUN export
 
 WORKDIR /var/www/

+ 1 - 1
resources/views/home.blade.php

@@ -13,7 +13,7 @@
                                 {{ session('status') }}
                             </div>
                         @endif
-                        Это победа? но это даааа))
+                        Это победа? вася
                         {{ __('You are logged in!') }}
                     </div>
                 </div>