From d70e2d6192892eb8d6ff0cd4074e4795630c2c64 Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 24 Aug 2024 19:51:52 +0000 Subject: [PATCH] basic denv changes --- .gitignore | 1 + bin/script/build | 3 - bin/script/down | 3 - bin/script/exec | 23 ------- bin/script/init | 18 +++-- bin/script/stop | 3 - bin/script/up | 3 - composer.development.json | 122 ---------------------------------- docker/docker-compose-mac.yml | 1 - docker/docker-compose.yml | 1 - 10 files changed, 12 insertions(+), 166 deletions(-) delete mode 100755 bin/script/build delete mode 100755 bin/script/down delete mode 100755 bin/script/exec delete mode 100755 bin/script/stop delete mode 100755 bin/script/up delete mode 100644 composer.development.json diff --git a/.gitignore b/.gitignore index 810eee8..23a615a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ *.env composer.lock +composer.development.json diff --git a/bin/script/build b/bin/script/build deleted file mode 100755 index 0cf812a..0000000 --- a/bin/script/build +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -$SCRIPT_DIR/exec build \ No newline at end of file diff --git a/bin/script/down b/bin/script/down deleted file mode 100755 index 7b6b977..0000000 --- a/bin/script/down +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -$SCRIPT_DIR/exec down \ No newline at end of file diff --git a/bin/script/exec b/bin/script/exec deleted file mode 100755 index e57c87c..0000000 --- a/bin/script/exec +++ /dev/null @@ -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) diff --git a/bin/script/init b/bin/script/init index 413fc2d..f2baa98 100755 --- a/bin/script/init +++ b/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 -$SCRIPT_DIR/exec build -$SCRIPT_DIR/exec up -d +# Source key-scripts +source $ENV_DIR/bin/drun +source $ENV_DIR/bin/dexec -# Source drun -source $ENV_DIR/bin/script/drun +# Build and start docker containers +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 diff --git a/bin/script/stop b/bin/script/stop deleted file mode 100755 index 64393e9..0000000 --- a/bin/script/stop +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -$SCRIPT_DIR/exec stop \ No newline at end of file diff --git a/bin/script/up b/bin/script/up deleted file mode 100755 index 7bd3164..0000000 --- a/bin/script/up +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -$SCRIPT_DIR/exec up -d \ No newline at end of file diff --git a/composer.development.json b/composer.development.json deleted file mode 100644 index bd0d9df..0000000 --- a/composer.development.json +++ /dev/null @@ -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" - } - } -} \ No newline at end of file diff --git a/docker/docker-compose-mac.yml b/docker/docker-compose-mac.yml index 1f1da0c..2b93ebd 100644 --- a/docker/docker-compose-mac.yml +++ b/docker/docker-compose-mac.yml @@ -1,4 +1,3 @@ -version: '3' networks: template: external: true diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 094d233..4f0f616 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' networks: template: external: true