basic denv changes

.gitignore

@@ -13,3 +13,4 @@
 
 *.env
 composer.lock
+composer.development.json

bin/script/build

@@ -1,3 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-$SCRIPT_DIR/exec build

bin/script/down

@@ -1,3 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-$SCRIPT_DIR/exec down

bin/script/exec

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-COMMAND="$@"
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-#LOAD ENV VARIABLES FROM .ENV
-export $(grep -v '^#' "${SCRIPT_DIR}/../../.env" | xargs)
-
-#MAC
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    docker-compose -f "${SCRIPT_DIR}/../../docker/docker-compose-mac.yml" $COMMAND
-
-#LINUX
-elif [[ "$OSTYPE" == "linux-gnu" ]]; then
-    docker-compose -f "${SCRIPT_DIR}/../../docker/docker-compose.yml" $COMMAND
-
-else
-    echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
-    exit 1
-fi
-
-#UNSET ENV VARIABLES FROM .ENV
-unset $(grep -v '^#' "${SCRIPT_DIR}/../../.env" | sed -E 's/(.*)=.*/\1/' | xargs)

bin/script/init

@@ -2,27 +2,31 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 PROJECT_DIR=$(realpath $SCRIPT_DIR/../../)
-ENV_DIR=$(realpath $PROJECT_DIR/../../)
+ENV_DIR=$(realpath $PROJECT_DIR/../../../)
 
 # Check .env file
 if [ ! -f "$PROJECT_DIR/.env" ]
 then
   echo "Create .env file from example..."
   cp "$PROJECT_DIR/.env.example" "$PROJECT_DIR/.env"
-  echo ".env file created, please change variables and call me again"
+  echo ".env file created, please change variables and call init again"
   exit 1
 fi
 
-# Build and start docker containers
+# Source key-scripts
-$SCRIPT_DIR/exec build
+source $ENV_DIR/bin/drun
-$SCRIPT_DIR/exec up -d
+source $ENV_DIR/bin/dexec
 
-# Source drun
+# Build and start docker containers
-source $ENV_DIR/bin/script/drun
+dexec template-backend build
+dexec template-backend up -d
 
 # Install PHP packages
 drun template-backend composer install
 
+# Dump autoload
+drun template-backend composer da
+
 # Migrate databases to current version
 drun template-backend composer dmm
 drun template-backend composer dmlm

bin/script/stop

@@ -1,3 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-$SCRIPT_DIR/exec stop

bin/script/up

@@ -1,3 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-$SCRIPT_DIR/exec up -d

composer.development.json

@@ -1,122 +0,0 @@
-{
-    "require": {
-        "laminas\/laminas-servicemanager": "^3.21",
-        "mezzio\/mezzio-laminasrouter": "^3.8",
-        "reinfi\/zf-dependency-injection": "^5.4",
-        "laminas\/laminas-config-aggregator": "^1.13",
-        "doctrine\/doctrine-orm-module": "5.0.*",
-        "doctrine\/migrations": "^3.5",
-        "doctrine\/orm": "2.11.3",
-        "doctrine\/persistence": "2.2.*",
-        "ramsey\/uuid-doctrine": "^1.8",
-        "roave\/psr-container-doctrine": "^3.1",
-        "mezzio\/mezzio": "^3.17",
-        "mezzio\/mezzio-helpers": "^5.15",
-        "symfony\/cache": "5.4.8",
-        "doctrine\/dbal": "^3.6",
-        "teewurst\/psr4-advanced-wildcard-composer-plugin": "^3.0",
-        "laminas\/laminas-crypt": "^3.10",
-        "monolog\/monolog": "^3.4",
-        "laminas\/laminas-mail": "^2.23",
-        "teewurst\/pipeline": "^3.0",
-        "guzzlehttp\/guzzle": "^7.8"
-    },
-    "autoload": {
-        "psr-4": {
-            "Template\\API\\Console\\": "src\/ApiDomain\/Console\/src",
-            "Template\\API\\External\\Authentication\\": "src\/ApiDomain\/External\/Authentication\/src",
-            "Template\\API\\External\\Health\\": "src\/ApiDomain\/External\/Health\/src",
-            "Template\\API\\External\\Product\\": "src\/ApiDomain\/External\/Product\/src",
-            "Template\\API\\External\\User\\": "src\/ApiDomain\/External\/User\/src",
-            "Template\\Data\\Business\\": "src\/DataDomain\/Business\/src",
-            "Template\\Data\\Log\\": "src\/DataDomain\/Log\/src",
-            "Template\\Handling\\Product\\": "src\/HandlingDomain\/Product\/src",
-            "Template\\Handling\\Registration\\": "src\/HandlingDomain\/Registration\/src",
-            "Template\\Handling\\Role\\": "src\/HandlingDomain\/Role\/src",
-            "Template\\Handling\\User\\": "src\/HandlingDomain\/User\/src",
-            "Template\\Handling\\UserSession\\": "src\/HandlingDomain\/UserSession\/src",
-            "Template\\Infrastructure\\Database\\": "src\/Infrastructure\/Database\/src",
-            "Template\\Infrastructure\\DependencyInjection\\": "src\/Infrastructure\/DependencyInjection\/src",
-            "Template\\Infrastructure\\Encryption\\": "src\/Infrastructure\/Encryption\/src",
-            "Template\\Infrastructure\\Exception\\": "src\/Infrastructure\/Exception\/src",
-            "Template\\Infrastructure\\Logging\\": "src\/Infrastructure\/Logging\/src",
-            "Template\\Infrastructure\\Rbac\\": "src\/Infrastructure\/Rbac\/src",
-            "Template\\Infrastructure\\Request\\": "src\/Infrastructure\/Request\/src",
-            "Template\\Infrastructure\\Response\\": "src\/Infrastructure\/Response\/src",
-            "Template\\Infrastructure\\Session\\": "src\/Infrastructure\/Session\/src",
-            "Template\\Infrastructure\\UuidGenerator\\": "src\/Infrastructure\/UuidGenerator\/src"
-        }
-    },
-    "extra": {
-        "teewurst\/psr4-advanced-wildcard-composer-plugin": {
-            "autoload": {
-                "psr-4": {
-                    "Template\\API\\%s\\%s\\": "src\/ApiDomain\/{*}\/{*}\/src\/",
-                    "Template\\Data\\%s\\": "src\/DataDomain\/{*}\/src\/",
-                    "Template\\Handling\\%s\\": "src\/HandlingDomain\/{*}\/src\/",
-                    "Template\\Infrastructure\\%s\\": "src\/Infrastructure\/{*}\/src\/"
-                }
-            },
-            "autoload-dev": {
-                "psr-4": {
-                    "Template\\API\\%s\\%s\\": "src\/ApiDomain\/{*}\/{*}\/src\/",
-                    "Template\\Data\\%s\\": "src\/DataDomain\/{*}\/src\/",
-                    "Template\\Handling\\%s\\": "src\/HandlingDomain\/{*}\/src\/",
-                    "Template\\Infrastructure\\%s\\": "src\/Infrastructure\/{*}\/src\/"
-                }
-            }
-        }
-    },
-    "scripts": {
-        "dmg": "php bin\/doctrine-migrations.php migrations:generate --no-interaction",
-        "dmm": "php bin\/doctrine-migrations.php migrations:migrate --no-interaction",
-        "dmlg": "php bin\/doctrine-migrations-log.php migrations:generate --no-interaction",
-        "dmlm": "php bin\/doctrine-migrations-log.php migrations:migrate --no-interaction",
-        "console": "php bin\/console.php",
-        "serve": "php -S 0.0.0.0:8080 -t public\/",
-        "unserve": "killall -9 php",
-        "da": [
-            "composer dump-autoload",
-            "composer dump-autoload --dev"
-        ],
-        "initdb": [
-            "@composer dmm",
-            "@composer dmlm",
-            "@composer console rbac:update",
-            "@composer console init:data"
-        ]
-    },
-    "config": {
-        "allow-plugins": {
-            "teewurst\/psr4-advanced-wildcard-composer-plugin": true
-        }
-    },
-    "require-dev": {
-        "symfony\/dotenv": "^6.3"
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Template\\API\\External\\Authentication\\": "src\/ApiDomain\/External\/Authentication\/src",
-            "Template\\API\\External\\Health\\": "src\/ApiDomain\/External\/Health\/src",
-            "Template\\API\\External\\Product\\": "src\/ApiDomain\/External\/Product\/src",
-            "Template\\API\\External\\User\\": "src\/ApiDomain\/External\/User\/src",
-            "Template\\Data\\Business\\": "src\/DataDomain\/Business\/src",
-            "Template\\Data\\Log\\": "src\/DataDomain\/Log\/src",
-            "Template\\Handling\\Product\\": "src\/HandlingDomain\/Product\/src",
-            "Template\\Handling\\Registration\\": "src\/HandlingDomain\/Registration\/src",
-            "Template\\Handling\\Role\\": "src\/HandlingDomain\/Role\/src",
-            "Template\\Handling\\User\\": "src\/HandlingDomain\/User\/src",
-            "Template\\Handling\\UserSession\\": "src\/HandlingDomain\/UserSession\/src",
-            "Template\\Infrastructure\\Database\\": "src\/Infrastructure\/Database\/src",
-            "Template\\Infrastructure\\DependencyInjection\\": "src\/Infrastructure\/DependencyInjection\/src",
-            "Template\\Infrastructure\\Encryption\\": "src\/Infrastructure\/Encryption\/src",
-            "Template\\Infrastructure\\Exception\\": "src\/Infrastructure\/Exception\/src",
-            "Template\\Infrastructure\\Logging\\": "src\/Infrastructure\/Logging\/src",
-            "Template\\Infrastructure\\Rbac\\": "src\/Infrastructure\/Rbac\/src",
-            "Template\\Infrastructure\\Request\\": "src\/Infrastructure\/Request\/src",
-            "Template\\Infrastructure\\Response\\": "src\/Infrastructure\/Response\/src",
-            "Template\\Infrastructure\\Session\\": "src\/Infrastructure\/Session\/src",
-            "Template\\Infrastructure\\UuidGenerator\\": "src\/Infrastructure\/UuidGenerator\/src"
-        }
-    }
-}

docker/docker-compose-mac.yml

@@ -1,4 +1,3 @@
-version: '3'
 networks:
   template:
     external: true

docker/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 networks:
   template:
     external: true