From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 16 Apr 2025 13:28:13 +0000 (+0200)
Subject: wait #7486 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=85f397c0c449daa68f95e2a11a467cda4025188c;p=fluidbook-toolbox.git

wait #7486 @1
---

diff --git a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
index 537677abe..ae8a43c25 100644
--- a/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/DockerWebContainer.php
@@ -131,6 +131,7 @@ trait DockerWebContainer
             '$public' => ($laravel || $request->get('public')) ? '/public' : '/',
             '$environment' => $env,
             '$s3password' => Str::random(16),
+            '$ubuntu' => (version_compare($phpversion, '8.1', '>=')) ? 'noble' : 'jammy',
         ];
 
         if (!$variables['$domain']) {
@@ -267,7 +268,7 @@ trait DockerWebContainer
         $docker = $www . '/.docker';
 
         `mkdir -p $docker/$env;mv $dir/images $docker;mv $dir/config $docker;mv $dir/* $docker/$env`;
-        file_put_contents($dir . 'update', '#!/bin/sh' . "\n" . "cd /docker/$name$dockerSuffix\nrm ./update\nln -sf ./www/.docker/$env/docker-compose.yml docker-compose.yml\nln -sf ./www/.docker/$env/update update\nchmod 755 ./www/.docker/$env/update\n./www/.docker/$env/update");
+        file_put_contents($dir . 'update', '#!/bin/sh' . "\n" . "docker builder prune -a -f\ncd /docker/$name$dockerSuffix\nrm ./update\nln -sf ./www/.docker/$env/docker-compose.yml docker-compose.yml\nln -sf ./www/.docker/$env/update update\nchmod 755 ./www/.docker/$env/update\n./www/.docker/$env/update");
         chmod($dir . 'update', 0755);
         Files::recursiveReplaceStringInDir($dir, $variables);
 
diff --git a/resources/tools/dockerwebcontainer/base b/resources/tools/dockerwebcontainer/base
index 739beb9f0..ad3657b7d 100644
--- a/resources/tools/dockerwebcontainer/base
+++ b/resources/tools/dockerwebcontainer/base
@@ -1,4 +1,3 @@
-version: '3.1'
 services:
     webserver:
         container_name: $name-httpd
diff --git a/resources/tools/dockerwebcontainer/mysql b/resources/tools/dockerwebcontainer/mysql
index 4f8b7747d..0c78113ee 100644
--- a/resources/tools/dockerwebcontainer/mysql
+++ b/resources/tools/dockerwebcontainer/mysql
@@ -1,5 +1,5 @@
     adminer:
-      image: 'shyim/adminerevo'
+      image: 'adminer'
       container_name: $name-adminer
       restart: unless-stopped
       volumes:
diff --git a/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile b/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
index c9ea07f8a..78bfdbb3f 100644
--- a/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
+++ b/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
@@ -2,7 +2,7 @@
 # PHPDocker.io PHP $phpversion / CLI and FPM image #
 ############################################
 
-FROM ubuntu:jammy AS cli
+FROM ubuntu:$ubuntu AS cli
 
 WORKDIR "/application"
 
@@ -15,7 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Add Ondrej PHP repository
 RUN apt update \
     && apt install -y --no-install-recommends ca-certificates gnupg bash curl \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu $ubuntu main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C
 
 # Add Nodejs Repository
diff --git a/resources/tools/dockerwebcontainer/template/www-laravel/.env b/resources/tools/dockerwebcontainer/template/www-laravel/.env
new file mode 100644
index 000000000..66ae0e652
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/template/www-laravel/.env
@@ -0,0 +1,26 @@
+APP_NAME=$name
+APP_ENV=$environment
+APP_KEY=
+APP_DEBUG=true
+APP_URL=https://$domain
+
+DEBUGBAR_ENABLED=true
+DEBUGBAR_OPEN_STORAGE=true
+
+MAIL_HOST=mail2.cubedesigners.com
+MAIL_PORT=587
+MAIL_USERNAME=external@cubedesigners.com
+MAIL_PASSWORD=z6hfYZJEfFZp48pza3
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=external@cubedesigners.com
+MAIL_FROM_NAME="$name"
+MAIL_BCC_ALL=test+$name@cubedesigners.com
+
+QUEUE_CONNECTION=database
+
+SESSION_LIFETIME=1200
+
+BACKPACK_LOCALES=en,fr
+TIMEZONE=Europe/Paris
+
+POWERED_BY_LINK=https://www.cubedesigners.com/
diff --git a/resources/tools/dockerwebcontainer/template/www-laravel/public/index.php b/resources/tools/dockerwebcontainer/template/www-laravel/public/index.php
new file mode 100644
index 000000000..61ace196d
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/template/www-laravel/public/index.php
@@ -0,0 +1,2 @@
+<?php
+phpinfo();
diff --git a/resources/tools/dockerwebcontainer/template/www/.env b/resources/tools/dockerwebcontainer/template/www/.env
deleted file mode 100644
index 66ae0e652..000000000
--- a/resources/tools/dockerwebcontainer/template/www/.env
+++ /dev/null
@@ -1,26 +0,0 @@
-APP_NAME=$name
-APP_ENV=$environment
-APP_KEY=
-APP_DEBUG=true
-APP_URL=https://$domain
-
-DEBUGBAR_ENABLED=true
-DEBUGBAR_OPEN_STORAGE=true
-
-MAIL_HOST=mail2.cubedesigners.com
-MAIL_PORT=587
-MAIL_USERNAME=external@cubedesigners.com
-MAIL_PASSWORD=z6hfYZJEfFZp48pza3
-MAIL_ENCRYPTION=tls
-MAIL_FROM_ADDRESS=external@cubedesigners.com
-MAIL_FROM_NAME="$name"
-MAIL_BCC_ALL=test+$name@cubedesigners.com
-
-QUEUE_CONNECTION=database
-
-SESSION_LIFETIME=1200
-
-BACKPACK_LOCALES=en,fr
-TIMEZONE=Europe/Paris
-
-POWERED_BY_LINK=https://www.cubedesigners.com/
diff --git a/resources/tools/dockerwebcontainer/template/www/index.php b/resources/tools/dockerwebcontainer/template/www/index.php
new file mode 100644
index 000000000..61ace196d
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/template/www/index.php
@@ -0,0 +1,2 @@
+<?php
+phpinfo();
diff --git a/resources/tools/dockerwebcontainer/template/www/public/index.php b/resources/tools/dockerwebcontainer/template/www/public/index.php
deleted file mode 100644
index 61ace196d..000000000
--- a/resources/tools/dockerwebcontainer/template/www/public/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-phpinfo();