Merge branch 'release/next' into fix/incorrect-links

markshust · Apr 17, 2024 · 592c276 · 592c276
2 parents 438cc0f + ed401d3
commit 592c276
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/compose/bin/download b/compose/bin/download
@@ -10,6 +10,11 @@ NC='\033[0m' # No Color
 
 bin/stop
 
+if [ -d "./bin" ]; then
+  echo "Error: The current directory is not empty. Please remove all contents within this directory and try again."
+  exit 1
+fi
+
 bin/start --no-dev
 [ $? != 0 ] && echo "Failed to start Docker services" && exit
 

diff --git a/compose/compose.dev-linux.yaml b/compose/compose.dev-linux.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     volumes: &appvolumes

diff --git a/compose/compose.dev-ssh.yaml b/compose/compose.dev-ssh.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     volumes: &appvolumes

diff --git a/compose/compose.dev.yaml b/compose/compose.dev.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     volumes: &appvolumes

diff --git a/compose/compose.healthcheck.yaml b/compose/compose.healthcheck.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   app:
     healthcheck:

diff --git a/compose/compose.yaml b/compose/compose.yaml
@@ -10,8 +10,6 @@
 ## 172.17.0.1 in this file with the result of:
 ## docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}'
 
-version: "3"
-
 services:
   app:
     image: markoshust/magento-nginx:1.24-0
@@ -116,14 +114,14 @@ services:
     image: sj26/mailcatcher
     ports:
       - "1080:1080"
-  
+
   ## Cloudflare tunnel support, uncomment to enable
   #tunnel:
   #  container_name: cloudflared-tunnel
   #  image: cloudflare/cloudflared:latest
   #  command: tunnel run
   #  env_file: env/cloudflare.env
-  
+
   ## Blackfire support, uncomment to enable
   #blackfire:
   #  image: blackfire/blackfire:2

diff --git a/lib/onelinesetup b/lib/onelinesetup
@@ -2,7 +2,7 @@
 set -o errexit
 
 DOMAIN=${1:-magento.test}
-VERSION=${2:-2.4.6-p4}
+VERSION=${2:-2.4.7}
 EDITION=${3:-community}
 
 curl -s https://raw.githubusercontent.com/markshust/docker-magento/release/next/lib/template | bash

diff --git a/lib/template b/lib/template
@@ -3,6 +3,12 @@ git init -qqq
 git remote add origin https://github.com/markshust/docker-magento
 git fetch origin -qqq
 git checkout origin/release/next -- compose
+
+if [ -d "./bin" ]; then
+  echo "Error: The current directory is not empty. Please remove all contents within this directory and try again."
+  exit 1
+fi
+
 mv compose/* ./
 mv compose/.gitignore ./
 mv compose/.vscode ./