DreamFactory 7 Release (#116)

* DP-513 Add web.config deny setting to nginx server configuration

* use ubuntu20 image

* update readme

* Update dreamfactory.conf

Support for PHP 8.3

* Update docker-entrypoint.sh

Add support for PHP 8.3

* Testing Laravel 11

* Laravel 11 OSS rebuild

* Update Dockerfile

* Update Dockerfile

* Update Dockerfile

* Update docker-entrypoint.sh

* Update docker-entrypoint.sh

---------

Co-authored-by: Tomo Norman <tomo.l.norman@gmail.com>
Co-authored-by: Kevin McGahey <36458555+thekevinm@users.noreply.github.com>
Co-authored-by: Kevin McGahey <kevinmcgahey1114@gmail.com>

Author: 3 people

Dockerfile

@@ -1,57 +1,38 @@
-ARG BASE=dreamfactorysoftware/df-base-img:v6
-FROM $BASE
+FROM dreamfactorysoftware/df-base-img:shift
 
 # Configure Nginx
 COPY dreamfactory.conf /etc/nginx/sites-available/dreamfactory.conf
 
 # Get DreamFactory
-ARG BRANCH=master
+ARG BRANCH=shift-124321
 RUN git clone --branch $BRANCH https://github.com/dreamfactorysoftware/dreamfactory.git /opt/dreamfactory
 
 WORKDIR /opt/dreamfactory
 
-# Uncomment lines 14 & 51 if you would like to upgrade your environment while replacing the License Key value with your issued Key and adding the license files to the df-docker directory.
-# COPY composer.* /opt/dreamfactory/
-
-# Set environment variables
-ENV REPO_OWNER=dreamfactorysoftware/df-admin-interface
-ENV REPO_URL=https://github.com/$REPO_OWNER
-ENV DF_FOLDER=/opt/dreamfactory
-ENV DESTINATION_FOLDER=$DF_FOLDER/public
-ENV TEMP_FOLDER=/tmp/df-ui
-ENV RELEASE_FILENAME=release.zip
-ENV FOLDERS_TO_REMOVE="dreamfactory filemanager df-api-docs-ui assets"
-
-# Create necessary directories
-RUN mkdir -p $TEMP_FOLDER $DESTINATION_FOLDER
-
-# Download and install DreamFactory frontend
-RUN cd $TEMP_FOLDER && \
-    response=$(curl -s -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/$REPO_OWNER/releases") && \
-    latest_release=1.3.5 && \
-    release_url="$REPO_URL/releases/download/$latest_release/release.zip" && \
-    curl -LO "$release_url" && \
-    find "$DESTINATION_FOLDER" -type f \( -name "*.js" -o -name "*.css" \) -exec rm {} \; && \
-    for folder in $FOLDERS_TO_REMOVE; do \
-        if [ -d "$DESTINATION_FOLDER/$folder" ]; then rm -rf "$DESTINATION_FOLDER/$folder"; fi; \
-    done && \
-    unzip -qo "$RELEASE_FILENAME" -d "$TEMP_FOLDER" && \
-    mv dist/index.html "$DF_FOLDER/resources/views/index.blade.php" && \
-    mv dist/* "$DESTINATION_FOLDER" && \
-    cd .. && rm -rf "$TEMP_FOLDER"
-
-# Install packages
-RUN composer install --no-dev --ignore-platform-reqs && \
+# Create storage structure and set permissions first
+RUN mkdir -p /opt/dreamfactory/storage/app \
+    && mkdir -p /opt/dreamfactory/storage/framework/cache \
+    && mkdir -p /opt/dreamfactory/storage/framework/sessions \
+    && mkdir -p /opt/dreamfactory/storage/framework/views \
+    && mkdir -p /opt/dreamfactory/storage/logs \
+    && mkdir -p /opt/dreamfactory/bootstrap/cache \
+    && chown -R www-data:www-data /opt/dreamfactory/storage \
+    && chown -R www-data:www-data /opt/dreamfactory/bootstrap/cache \
+    && chmod -R 775 /opt/dreamfactory/storage \
+    && chmod -R 775 /opt/dreamfactory/bootstrap/cache
+
+# Clear composer cache and install packages
+RUN composer clear-cache && \
+    COMPOSER_MEMORY_LIMIT=-1 composer install --no-dev --ignore-platform-reqs --no-scripts && \
+    COMPOSER_MEMORY_LIMIT=-1 composer install --no-dev --ignore-platform-reqs && \
     php artisan df:env --db_connection=sqlite --df_install=Docker && \
     chown -R www-data:www-data /opt/dreamfactory && \
     rm /etc/nginx/sites-enabled/default
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
-# RUN sed -i "s,\#DF_REGISTER_CONTACT=,DF_LICENSE_KEY=YOUR_LICENSE_KEY," /opt/dreamfactory/.env
-
 # Set proper permission to docker-entrypoint.sh script and forward error logs to docker log collector
-RUN chmod +x /docker-entrypoint.sh && ln -sf /dev/stderr /var/log/nginx/error.log && rm -rf /var/lib/apt/lists/*
+RUN chmod +x /docker-entrypoint.sh && ln -sf /dev/stderr /var/log/nginx/error.log
 
 # Clean up
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

README.md

@@ -32,6 +32,7 @@
 * <a href="#feedback">Feedback</a>
 
 <a name="prerequisites"></a>
+
 ## Prerequisites
 
 ### Install Docker

docker-compose.yml

@@ -9,12 +9,12 @@ services:
     image: mysql:5.7
     volumes:
       - df-mysql:/var/lib/mysql
-      
+
   example_data:
     environment:
       DATASETS: pagila
       POSTGRES_PASSWORD: root_pw
-    image: aa8y/postgres-dataset    
+    image: aa8y/postgres-dataset
 
   redis:
     image: redis
@@ -24,7 +24,7 @@ services:
       - mysql
     environment:
       SERVERNAME: dreamfactory.local
-#      HTTPS_HEADER: "on"
+      # HTTPS_HEADER: "on"
       # APP_KEY: YOUR_APP_KEY
       DB_DRIVER: mysql
       DB_HOST: mysql
@@ -36,9 +36,9 @@ services:
       CACHE_DATABASE: 0
       CACHE_PORT: 6379
 
-#      APP_LOG_LEVEL: debug
+      APP_LOG_LEVEL: debug
 #      LOG_TO_STDOUT: "true"
-#      APP_DEBUG: "true"
+      APP_DEBUG: "true"
 
 #      Uncomment and configure to enable emailing
 #      SENDMAIL_DEFAULT_COMMAND: "/usr/sbin/sendmail -t"
@@ -59,6 +59,7 @@ services:
 #      LOGSDB_ENABLED: "true"
     volumes:
       - df-storage:/opt/dreamfactory/storage
+#      - ../dreamfactory-development-packages:/src/dreamfactory
     build: .
     ports:
       - "80:80"

docker-entrypoint.sh

@@ -8,21 +8,22 @@ rm -f $CONF
 # Check if the directory already exists.
 if [ ! -d "$CONF" ]; then
   ### Take action if $DIR exists ###
-  mkdir /etc/ssmtp
+  mkdir /etc/ssmtp -p
 fi
 
 # Filter the env variables for ssmtp configs and write them to the config file
 env | awk -F'\n' '/^SSMTP_/ { print substr($1, 7) }' > "$CONF"
 
 # Configure NGINX and www.conf
 ln -s /etc/nginx/sites-available/dreamfactory.conf /etc/nginx/sites-enabled/dreamfactory.conf && \
-sed -i "s/pm.max_children = 5/pm.max_children = 5000/" /etc/php/8.1/fpm/pool.d/www.conf && \
-sed -i "s/pm.start_servers = 2/pm.start_servers = 150/" /etc/php/8.1/fpm/pool.d/www.conf && \
-sed -i "s/pm.min_spare_servers = 1/pm.min_spare_servers = 100/" /etc/php/8.1/fpm/pool.d/www.conf && \
-sed -i "s/pm.max_spare_servers = 3/pm.max_spare_servers = 200/" /etc/php/8.1/fpm/pool.d/www.conf && \
-sed -i "s/pm = dynamic/pm = ondemand/" /etc/php/8.1/fpm/pool.d/www.conf && \
+sed -i "s/pm.max_children = 5/pm.max_children = 5000/" /etc/php/8.3/fpm/pool.d/www.conf && \
+sed -i "s/pm.start_servers = 2/pm.start_servers = 150/" /etc/php/8.3/fpm/pool.d/www.conf && \
+sed -i "s/pm.min_spare_servers = 1/pm.min_spare_servers = 100/" /etc/php/8.3/fpm/pool.d/www.conf && \
+sed -i "s/pm.max_spare_servers = 3/pm.max_spare_servers = 200/" /etc/php/8.3/fpm/pool.d/www.conf && \
+sed -i "s/pm = dynamic/pm = ondemand/" /etc/php/8.3/fpm/pool.d/www.conf && \
 sed -i "s/worker_connections 768;/worker_connections 2048;/" /etc/nginx/nginx.conf && \
 sed -i "s/keepalive_timeout 65;/keepalive_timeout 10;/" /etc/nginx/nginx.conf
+sed -i 's/DF_INSTALL=.*/DF_INSTALL=Docker/' .env
 
 # update site configuration
 # if no servername is provided use dreamfactory.app as default
@@ -31,6 +32,24 @@ sed -i "s;%SERVERNAME%;${SERVERNAME:=dreamfactory.app};g" /etc/nginx/sites-avail
 # Allow Laravel to accept requests from top level reverse proxy if it is using HTTPS. "off" by default.
 sed -i "s;%HTTPS_HEADER%;${HTTPS_HEADER:=off};g" /etc/nginx/sites-available/dreamfactory.conf
 
+# Wait for MySQL to be ready if using MySQL
+if [ "$DB_CONNECTION" = "mysql" ]; then
+    echo "Waiting for MySQL to be ready..."
+    for i in {1..30}; do
+        if mysql -h"$DB_HOST" -u"$DB_USERNAME" -p"$DB_PASSWORD" -e "SELECT 1" >/dev/null 2>&1; then
+            echo "MySQL is ready"
+            break
+        fi
+        echo "MySQL not ready yet... waiting"
+        sleep 1
+    done
+fi
+
+if [ ! -d "/opt/dreamfactory/public/dreamfactory" ]; then
+    cd /opt/dreamfactory
+    composer install --no-dev --ignore-platform-reqs
+fi
+
 # do we have configs for a cache ?
 if [ -n "$CACHE_DRIVER" ]; then
   echo "Setting CACHE_DRIVER, CACHE_HOST, CACHE_DATABASE"
@@ -195,8 +214,8 @@ if [ -n "$SENDMAIL_DEFAULT_COMMAND" ]; then
   sed -i "s/#SENDMAIL_DEFAULT_COMMAND=.*/SENDMAIL_DEFAULT_COMMAND=\"$(echo "$SENDMAIL_DEFAULT_COMMAND" | sed 's/\//\\\//g')\"/" .env
 fi
 
-# start php8.1-fpm
-service php8.1-fpm start
+# start php8.3-fpm
+service php8.3-fpm start
 
 # start cron service for df-scheduler
 service cron start

dreamfactory.conf

@@ -1,5 +1,5 @@
 upstream php_handler {
-    server unix:/var/run/php/php8.1-fpm.sock;
+    server unix:/var/run/php/php8.3-fpm.sock;
     #server 127.0.0.1:9000 backup;
 }
 
@@ -64,4 +64,4 @@ server {
     location ~ /web.config {
         deny all;
     }
-}
+}