Merge pull request #38 from oroneta/fix_from_server

hotfix

docker/.env

@@ -8,4 +8,4 @@ DB_PORT = 5432
 PUBLIC_URL = /
 
 
-SERVER_ENV = pro # Or set to pro
+SERVER_ENV = dev # [ pro, dev, build ]

docker/docker-compose.dev.yml

@@ -26,9 +26,10 @@ services:
             context: ..
             dockerfile: ./docker/www/${SERVER_ENV}/Dockerfile
         ports: 
-            - "80:80"
+            - "80:3000"
         env_file:
             - .env
+        stdin_open: true
         depends_on:
             - oroneta.drone-front.db
         volumes:
@@ -44,7 +45,7 @@ services:
         depends_on: 
             - oroneta.drone-front.db
         ports:
-            - "8081:80"
+            - "8082:80"
         environment:
             # PMA_HOST: ${DB_HOST}
             PMA_HOST: ${DB_HOST}

docker/www/build/Dockerfile

@@ -0,0 +1,59 @@
+# Build React Website
+# FROM node:20.11.1 as build
+
+# WORKDIR /app
+
+# # Solve Error: error:0308010C:digital envelope routines::unsupported
+# # https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
+# ENV NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=4096"
+
+# # Copy source to build
+# COPY ./src ./
+
+# # Install all dependencies
+# RUN npm install
+# RUN npm run build
+
+
+# # ---------------------------------
+
+
+# Production
+FROM php:8.0.0-apache
+ARG DEBIAN_FRONTEND=noninteractive
+
+WORKDIR /var/www/html
+
+# Remove old
+RUN rm -rf ./*
+
+# Copy from react buld to production server
+COPY ./src/build /var/www/html
+
+# COPY ./www .
+
+RUN docker-php-ext-install pdo
+RUN docker-php-ext-install pdo_mysql
+
+# Include alternative DB driver
+# RUN docker-php-ext-install mysqli
+
+
+RUN apt-get update \
+    && apt-get install -y sendmail libpng-dev \
+    && apt-get install -y libzip-dev \
+    && apt-get install -y zlib1g-dev \
+    && apt-get install -y libonig-dev \
+    && rm -rf /var/lib/apt/lists/* \
+    && docker-php-ext-install zip
+
+
+
+
+
+RUN docker-php-ext-install mbstring
+RUN docker-php-ext-install zip
+RUN docker-php-ext-install gd
+
+RUN a2enmod rewrite
+

docker/www/build/README.md

@@ -0,0 +1 @@
+Get build files from local, instead building inside docker

docker/www/dev/Dockerfile

@@ -1,31 +1,15 @@
+# Build React Website
+FROM node:20.11.1 as build
 
-# Dev pre-production
-FROM php:8.0.0-apache
-ARG DEBIAN_FRONTEND=noninteractive
+WORKDIR /app
 
-WORKDIR /var/www/html
+# Solve Error: error:0308010C:digital envelope routines::unsupported
+# https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
+ENV NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=4096"
 
+# Copy source to build
+COPY ./src ./
 
-RUN docker-php-ext-install pdo
-RUN docker-php-ext-install pdo_mysql
-
-# Include alternative DB driver
-# RUN docker-php-ext-install mysqli
-
-
-RUN apt-get update \
-    && apt-get install -y sendmail libpng-dev \
-    && apt-get install -y libzip-dev \
-    && apt-get install -y zlib1g-dev \
-    && apt-get install -y libonig-dev \
-    && rm -rf /var/lib/apt/lists/* \
-    && docker-php-ext-install zip
-
-
-
-RUN docker-php-ext-install mbstring
-RUN docker-php-ext-install zip
-RUN docker-php-ext-install gd
-
-RUN a2enmod rewrite
-
+# Install all dependencies
+RUN npm install
+CMD ["npm", "run", "start", "&&", "tail", "-f", "/dev/null"]

docker/www/pro/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /app
 
 # Solve Error: error:0308010C:digital envelope routines::unsupported
 # https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
-ENV NODE_OPTIONS=--openssl-legacy-provider
+ENV NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=4096"
 
 # Copy source to build
 COPY ./src ./

src/src/.dockerignore

@@ -0,0 +1 @@
+.DS_Store