From 85f397c0c449daa68f95e2a11a467cda4025188c Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 16 Apr 2025 15:28:13 +0200
Subject: [PATCH] wait #7486 @1

---
 .../Controllers/Admin/Operations/Tools/DockerWebContainer.php | 3 ++-
 resources/tools/dockerwebcontainer/base                       | 1 -
 resources/tools/dockerwebcontainer/mysql                      | 2 +-
 .../dockerwebcontainer/template/images/php-fpm/Dockerfile     | 4 ++--
 .../dockerwebcontainer/template/{www => www-laravel}/.env     | 0
 .../template/{www => www-laravel}/public/index.php            | 0
 resources/tools/dockerwebcontainer/template/www/index.php     | 2 ++
 7 files changed, 7 insertions(+), 5 deletions(-)
 rename resources/tools/dockerwebcontainer/template/{www => www-laravel}/.env (100%)
 rename resources/tools/dockerwebcontainer/template/{www => www-laravel}/public/index.php (100%)
 create mode 100644 resources/tools/dockerwebcontainer/template/www/index.php

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/.env b/resources/tools/dockerwebcontainer/template/www-laravel/.env
similarity index 100%
rename from resources/tools/dockerwebcontainer/template/www/.env
rename to resources/tools/dockerwebcontainer/template/www-laravel/.env
diff --git a/resources/tools/dockerwebcontainer/template/www/public/index.php b/resources/tools/dockerwebcontainer/template/www-laravel/public/index.php
similarity index 100%
rename from resources/tools/dockerwebcontainer/template/www/public/index.php
rename to resources/tools/dockerwebcontainer/template/www-laravel/public/index.php
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();
-- 
2.39.5