docker-compose.yml adaptado a prod y agregado docker-compose.dev.yml para desarrollo

.env.example

@@ -1,55 +1,8 @@
-APP_NAME="Pedidos MPS"
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-VITE_DEV_SERVER_URL=http://vite:5173
-
-LOG_CHANNEL=stack
-
 USERID=1000
 
-DB_CONNECTION=mysql
-DB_HOST=db
 DB_PORT_EXPOSED=3306
 DB_DATABASE=pedi2
 DB_USERNAME=pedi2
 DB_PASSWORD=pedi2
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-WEB_CLIENT_EMAIL=informaticamps@buzon.uy
-WEB_CLIENT_NAME=web
-WEB_CLIENT_PASS=pass
 NGINX_PORT=8000

.gitignore

@@ -6,6 +6,7 @@
 .env
 .env.backup
 .phpunit.result.cache
+*.swp
 Homestead.json
 Homestead.yaml
 npm-debug.log

Dockerfile

@@ -28,12 +28,20 @@ RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath gd zip
 # Get latest Composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
+COPY ./server/ /var/www
+
 # Create system user to run Composer and Artisan Commands
-RUN useradd -G www-data,root -u $uid -d /home/$user $user
+RUN useradd -G www-data -u $uid -d /home/$user $user
 RUN mkdir -p /home/$user/.composer && \
-    chown -R $user:$user /home/$user
+    chown -R $user:$user /home/$user && \
+    chown -R $user:$user /var/www
+
 
 # Set working directory
 WORKDIR /var/www
 
 USER $user
+
+RUN composer install && \
+    php artisan key:generate && \
+    npm install 

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Dyarlen Iber
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

dev-start

@@ -1,2 +0,0 @@
-#!/usr/bin/bash
-docker-compose up -d && docker-compose exec app npm run watch

docker-compose.dev.yml

@@ -0,0 +1,76 @@
+version: '3.2'
+
+services:
+  app:
+    build:
+      args:
+        user: www
+        uid: ${USERID}
+      context: ./
+      dockerfile: Dockerfile
+    image: laravel-image
+    container_name: pedi2-app
+    restart: unless-stopped
+    working_dir: /var/www/
+    volumes:
+      - ./:/var/www
+      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
+    networks:
+      - app-network
+
+  vite:
+    build:
+      args:
+        user: www
+        uid: ${USERID}
+      context: ./
+    container_name: vite
+    working_dir: /var/www
+    command: npm run dev
+    volumes:
+      - ./:/var/www
+    ports:
+      - "5173:5173"
+    networks:
+      - app-network
+
+  db:
+    image: mysql:5.7
+    container_name: pedi2-db
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: ${DB_DATABASE}
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+      MYSQL_USER: ${DB_USERNAME}
+      SERVICE_TAGS: dev
+      SERVICE_NAME: mysql
+    volumes:
+      - ./mysql/my.cnf:/etc/mysql/my.cnf
+      - ./mysql/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
+      - dbdata:/var/lib/mysql
+    networks:
+      - app-network
+    ports:
+      - ${DB_PORT_EXPOSED}:3306
+
+  nginx:
+    image: nginx:alpine
+    container_name: pedi2-nginx
+    restart: unless-stopped
+    ports:
+      - ${NGINX_PORT}:80
+    volumes:
+      - ./:/var/www
+      - ./nginx/conf.d/:/etc/nginx/conf.d/
+    networks:
+      - app-network
+
+networks:
+  app-network:
+    driver: bridge
+
+#Volumes
+volumes:
+  dbdata:
+    driver: local

docker-compose.yml

@@ -8,27 +8,24 @@ services:
         uid: ${USERID}
       context: ./
       dockerfile: Dockerfile
-    image: laravel-image
+    image: pedi2-server
     container_name: pedi2-app
     restart: unless-stopped
     working_dir: /var/www/
     volumes:
-      - ./:/var/www
-      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
+      - server-storage:/var/www/storage
+      - server-public:/var/www/public
+      - server-root:/var/www
+#      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
     networks:
       - app-network
 
   vite:
-    build:
-      args:
-        user: www
-        uid: ${USERID}
-      context: ./
-    container_name: vite
-    working_dir: /var/www
+    image: pedi2-server
+#    working_dir: /var/www
     command: npm run dev
     volumes:
-      - ./:/var/www
+      - server-public:/var/www/public
     ports:
       - "5173:5173"
     networks:
@@ -46,8 +43,7 @@ services:
       SERVICE_TAGS: dev
       SERVICE_NAME: mysql
     volumes:
-      - ./mysql/my.cnf:/etc/mysql/my.cnf
-      - ./mysql/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
+#      - ./mysql/my.cnf:/etc/mysql/my.cnf
       - dbdata:/var/lib/mysql
     networks:
       - app-network
@@ -61,7 +57,9 @@ services:
     ports:
       - ${NGINX_PORT}:80
     volumes:
-      - ./:/var/www
+      - server-storage:/var/www/storage
+      - server-public:/var/www/public
+      - server-root:/var/www
       - ./nginx/conf.d/:/etc/nginx/conf.d/
     networks:
       - app-network
@@ -72,5 +70,11 @@ networks:
 
 #Volumes
 volumes:
+  server-root:
+    driver: local
+  server-storage:
+    driver: local
+  server-public:
+    driver: local
   dbdata:
     driver: local

run_watch.sh

@@ -1 +0,0 @@
-sudo docker compose exec app npm run watch

server/.env.example

@@ -0,0 +1,24 @@
+APP_NAME="Pedidos MPS"
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+VITE_DEV_SERVER_URL=http://vite:5173
+
+#LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=db
+DB_PORT_EXPOSED=3306
+DB_DATABASE=pedi2
+DB_USERNAME=pedi2
+DB_PASSWORD=pedi2
+
+#BROADCAST_DRIVER=log
+#CACHE_DRIVER=file
+#QUEUE_CONNECTION=sync
+#SESSION_DRIVER=file
+#SESSION_LIFETIME=120
+
+NGINX_PORT=8000