Merge pull request #13 from joglomedia/linux

Refactoring EasyDock Linux v2.x.x

Author: joglomedia

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [joglomedia, andreapollastri]
+custom: ['https://www.paypal.me/masedi']

.github/workflows/main.yml

@@ -1,64 +1,44 @@
-# This is a basic workflow to help you get started with Actions
-
 name: easydock-linux
-
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
     branches:
       - linux
       - master
   pull_request:
     branches: 
       - master
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-
       - uses: php-actions/composer@v5
-
       # Runs composer install Laravel for testing
-      - name: Run composer install Laravel
+      - name: Composer install Laravel
         run: composer create-project laravel/laravel test-app
-      
       # Prepare Laravel sample application
-      #- name: Prepare Laravel application
+      #- name: Prepare Laravel Application
       #  run: |
       #    cd test-app
       #    php artisan key:generate
-
-      # Install test dependencies
-      - name: Run install testing dependencies
+      # Install testing dependencies
+      - name: Install Testing Dependencies
         run: | 
           sudo apt-get update -qq -y
           sudo apt-get install -qq -y bash shellcheck
-      
-      # Shellcheck
-      - name: Run shellcheck testing
-        run: shellcheck -s bash -x ./src/easydock
-
+      # Shellcheck Tests
+      - name: Run Shellcheck Testing
+        run: shellcheck -s bash -x ./bin/easydock
       # Simple unit testing
-      - name: Run unit testing
+      - name: Run Unit Testing
         run: |
           cd test-app
-          bash ../src/easydock init
+          bash ../bin/easydock init
           if [ -f .env.easydock ]; then
             echo "Init EasyDock success"
-            bash ../src/easydock build
-            bash ../src/easydock up
+            bash ../bin/easydock build
+            bash ../bin/easydock up
           else
             echo "Init EasyDock fail"
             exit 1

.gitignore

@@ -1,5 +1,6 @@
 .env
-composer.lock
+Makefile
+releases
 vendor
 src/docker-compose.yml~
 src/Dockerfile~

LICENSE.md

@@ -1,7 +1,7 @@
 # The MIT License (MIT)
 
 Copyright (c) 2020 Andrea Pollastri
-              2021 Edi Septriyanto
+Copyright (c) 2021 Edi Septriyanto
 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,40 +6,40 @@
 
 <p align="center">
 <a href="https://github.com/joglomedia/easydock-linux/releases"><img src="https://img.shields.io/github/v/tag/joglomedia/easydock-linux?label=version" alt="EasyDock Linux version"></a>
+<a href="https://github.com/joglomedia/easydock-linux/stargazers"><img src="https://img.shields.io/github/stars/joglomedia/easydock-linux.svg" alt="GitHub stars"></a>
 <a href="https://github.com/joglomedia/easydock-linux/network"><img src="https://img.shields.io/github/forks/joglomedia/easydock-linux.svg" alt="GitHub forks"></a>
 <a href="https://github.com/joglomedia/easydock-linux/issues"><img src="https://img.shields.io/github/issues/joglomedia/easydock-linux.svg" alt="GitHub issues"></a>
-<a href="https://github.com/joglomedia/easydock-linux/stargazers"><img src="https://img.shields.io/github/stars/joglomedia/easydock-linux.svg" alt="GitHub stars"></a>
 <a href="https://github.com/joglomedia/easydock-linux/actions/workflows/main.yml"><img src="https://github.com/joglomedia/easydock-linux/actions/workflows/main.yml/badge.svg" alt="GitHub CI"></a>
 <a href="https://raw.githubusercontent.com/joglomedia/easydock-linux/master/LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub license"></a>
 </p>
 
 <p align="center">
-A fork of EasyDock for Linux. Docker LEMP stack easy integration.
+A fork of EasyDock to work in Linux. Docker LEMP stack easy integration.
 Dockerize your PHP apps ;)
 </p>
 
 ## Features
 
 EasyDock Linux comes with:
 
-- Nginx
+- Nginx (Latest stable)
 - PHP (7.4 and 8.0)
 - MariaDB (Drop-in replacement for MySQL)
-- PostgreSQL
-- Redis
+- PostgreSQL (Alternative SQL database)
+- Redis (In-memory key-value data store)
 - ~~phpmyadmin~~ Adminer (Lightweight MySQL admin)
-- MailHog
-- Node.js, NPM & Yarn
-- Git
-- Composer
+- MailHog (An email testing tool)
+- Node.js, NPM & Yarn (Front-end development tool)
+- Git (Version control system)
+- Composer (PHP application package manager)
 
 ## Requirements
 
-Docker and Docker Compose installed on Linux Distro (Debian or Ubuntu).
+Docker and Docker Compose installed on Linux Distro (Tested on Debian, Ubuntu, and LinuxMint).
 
 ## Installation
 
-- Integrate easydock in your PHP app via Composer.
+- Integrate EasyDock Linux in your PHP application via Composer.
 - You should add your Composer's vendor bin directory to your environment path.
 
 ```bash
@@ -52,13 +52,13 @@ easydock init && easydock import
 
 ## Getting Started
 
-After installation completed, if required, you could configure your `.env.easydock` file and then run this build command:
+Once you have installed EasyDock Linux successfully, if required, you could configure your `.env.easydock` file and then run this build command:
 
 ```bash
 easydock build
 ```
 
-During the build process EasyDock will download required Docker images. Once the build completes, you could _kick-up_ your EasyDock application by executing:
+During the build process, EasyDock Linux will download required Docker images. After the build completes, you could _kick-up_ your EasyDock Linux application by executing:
 
 ```bash
 easydock up
@@ -69,7 +69,7 @@ easydock up
 - The default Nginx server configuration `app.conf` will expose your project `/public` directory.
 - If your project uses different directory structure, you should adjust the configuration in `app.conf` file accordingly.
 - Your application by default accessible through localhost on port 8008 (`http://localhost:8008`)
-- Currently EasyDock-Linux only support stable PHP version; 7.4 & 8.0 from `joglomedia/easydock-php` image.
+- Currently, EasyDock Linux only supports stable PHP version: 7.4 & 8.0 from `joglomedia/easydock-php` image.
 
 The Nginx public port and PHP version could be configured inside `.env.easydock` file.
 
@@ -98,7 +98,7 @@ Database: easydockdb
 Username: easydock
 Password: secret
 Root password: rootsecret
-Host name: mysql ( or postgres for PostgreSQL )
+Host name: mysql ( or pgsql for PostgreSQL )
 ```
 
 For security reason, you should change the default database username and password configured in `.env.easydock` file.
@@ -120,7 +120,7 @@ DB_ROOT_PASS=rootsecret
 MYSQL_PORT=3306
 
 # POSTGRESQL PORT
-POSTGRES_PORT=5432
+PGSQL_PORT=5432
 ```
 
 ### Configure SMTP connection
@@ -234,4 +234,4 @@ You can support us using any of the methods below:
 
 EasyDock Linux is open-source project licensed under the MIT license.
 
-### Enjoy easydock ;)
+## Enjoy EasyDock for Linux ;)

src/easydock renamed to bin/easydock

@@ -7,8 +7,8 @@
 # | Authors           : Edi Septriyanto <me@masedi.net>                     |
 # |                     Andrea Pollastri <andrea@pollastri.dev>             |
 # | Min. requirement  : GNU/Linux Debian 8, Ubuntu 16.04 or Linux Mint 17   |
-# | Version           : 1.1.0-beta                                          |
-# | Last Update       : 25/06/2021                                          |
+# | Version           : 2.x.x                                               |
+# | Last Update       : 15/07/2021                                          |
 # +-------------------------------------------------------------------------+
 # | EasyDock-Linux Copyright (c) 2021 MasEDI.Net                            |
 # | EasyDock's Logo & Name Copyright (c) Andrea Pollastri                   |
@@ -25,13 +25,13 @@
 set -e
 
 # EasyDock version.
-ED_VERSION="1.1.0-beta"
+ED_VERSION="2.1.0"
 
 # EasyDock command (to pretify the instruction message).
 ED_CMD="bash easydock"
 
 # Sudo required commands.
-SUDO_CMDS="import remove reset"
+SUDO_CMDS="build import rebuild remove reset"
 
 # EasyDock CLI source directory.
 SOURCE="${BASH_SOURCE[0]}"
@@ -293,11 +293,13 @@ function ed_portscheck() {
 function ed_help() {
     echo -e "${bgpurple}${white}${bold} easydock Options List ${reset}${br}${br}"
     echo "${bgwhite}${black} ${ED_CMD} init ${reset}"
-    echo -e "Initialize easydock system for the first time.${br}"
+    echo -e "Initialize easydock system for new project.${br}"
     echo "${bgwhite}${black} ${ED_CMD} import ${reset}"
     echo -e "Import default easydock config (overwrite existing).${br}"
     echo "${bgwhite}${black} ${ED_CMD} build ${reset}"
-    echo -e "Build app container for easydock system.${br}"
+    echo -e "Build application image for easydock system.${br}"
+    echo "${bgwhite}${black} ${ED_CMD} rebuild ${reset}"
+    echo -e "Rebuild application image for easydock system.${br}"
     echo "${bgwhite}${black} ${ED_CMD} up ${reset}"
     echo -e "Power up easydock system.${br}"
     echo "${bgwhite}${black} ${ED_CMD} down ${reset}"
@@ -331,7 +333,7 @@ function ed_info() {
     echo -e "Stack: php:${ed_phpver} + mariadb:latest + nginx:latest ${br}"
     echo "${bold}MySQL / PostgreSQL${reset}"
     echo "MySQL Host: mysql:${ed_portmysql} (int) / 127.0.0.1:${ed_portmysql} (ext)"
-    echo "PostgreSQL Host: postgres:${ed_portpgsql} (int) / 127.0.0.1:${ed_portpgsql} (ext)"
+    echo "PostgreSQL Host: pgsql:${ed_portpgsql} (int) / 127.0.0.1:${ed_portpgsql} (ext)"
     echo "DB Name: ${ed_dbname}"
     echo "Username: ${ed_dbuser}"
     echo -e "Password: ${ed_dbpass} ${br}"
@@ -485,77 +487,83 @@ function ed_cli_menu() {
             shift
             ed_help
             exit
-            ;;
+        ;;
         info)
             shift
             ed_info
             exit
-            ;;
+        ;;
         import)
             shift
             ed_import
             exit
-            ;;
+        ;;
         build|setup)
             shift
             ed_setup
             exit
-            ;;
+        ;;
+        rebuild)
+            shift
+            ed_reset
+            ed_setup
+            exit
+        ;;
         reset)
             shift
             ed_reset "${action}"
             exit
-            ;;
+        ;;
         up)
             shift
             ed_up
             exit
-            ;;
+        ;;
         down)
             shift
             ed_down
             exit
-            ;;
+        ;;
         remove)
             shift
             ed_remove
             exit
-            ;;
+        ;;
         start)
             shift
             ed_start
             exit
-            ;;
+        ;;
         stop)
             shift
             ed_stop
             exit
-            ;;
+        ;;
         restart)
             shift
             ed_restart
             exit
-            ;;
+        ;;
         ps|status)
             shift
             ed_status
             exit
-            ;;
+        ;;
         conn|shell)
             shift
             ed_shell
             exit
-            ;;
+        ;;
         sql_shell)
             shift
             ed_sql_shell
             exit
-            ;;
+        ;;
         *)
             shift
             ed_notfound "${menu}"
             exit 1
-            ;;
+        ;;
         esac
         shift
     done
@@ -594,7 +602,7 @@ function ed_bootstrap() {
 
         ed_portapp=$(grep APP_PORT .env.easydock | cut -d '=' -f2)
         ed_portmysql=$(grep MYSQL_PORT .env.easydock | cut -d '=' -f2)
-        ed_portpgsql=$(grep POSTGRES_PORT .env.easydock | cut -d '=' -f2)
+        ed_portpgsql=$(grep PGSQL_PORT .env.easydock | cut -d '=' -f2)
         ed_portrds=$(grep REDIS_PORT .env.easydock | cut -d '=' -f2)
         ed_portpma=$(grep PMA_PORT .env.easydock | cut -d '=' -f2)
         ed_portmh=$(grep MH_PORT .env.easydock | cut -d '=' -f2)

composer.json

@@ -15,6 +15,6 @@
         }
     ],
     "bin": [
-        "src/easydock"
+        "bin/easydock"
     ]
 }