Merge pull request #11 from joglomedia/linux

v2.0.0 Let It Flow

Author: joglomedia

ed.png renamed to .github/assets/ed.png

@@ -0,0 +1,67 @@
+# 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
+        run: composer create-project laravel/laravel test-app
+      
+      # Prepare Laravel sample application
+      #- name: Prepare Laravel application
+      #  run: |
+      #    cd test-app
+      #    php artisan key:generate
+
+      # Install test dependencies
+      - name: Run 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
+
+      # Simple unit testing
+      - name: Run unit testing
+        run: |
+          cd test-app
+          bash ../src/easydock init
+          if [ -f .env.easydock ]; then
+            echo "Init EasyDock success"
+            bash ../src/easydock build
+            bash ../src/easydock up
+          else
+            echo "Init EasyDock fail"
+            exit 1
+          fi
+        env:
+          TERM: xterm-256color

ed_275px.png renamed to .github/assets/ed_275px.png

@@ -0,0 +1,22 @@
+# The MIT License (MIT)
+
+Copyright (c) 2020 Andrea Pollastri
+              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
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.

.github/workflows/main.yml

@@ -1,17 +1,26 @@
 # EasyDock for Linux ;)
 
-![EasyDock for Linux](ed_275px.png)
-
+<p align="center">
+    <img src="/.github/assets/ed_275px.png?raw=true" alt="EasyDock Logo © @andreapollastri"/>
+</p>
+
+<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/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.
-
 Dockerize your PHP apps ;)
-
-![GitHub stars](https://img.shields.io/github/stars/joglomedia/easydock-linux?style=social)
-![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/joglomedia/easydock-linux?label=version)
+</p>
 
 ## Features
 
-Easydock comes with:
+EasyDock Linux comes with:
 
 - Nginx
 - PHP (7.4 and 8.0)
@@ -49,12 +58,20 @@ After installation completed, if required, you could configure your `.env.easydo
 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:
+
+```bash
+easydock up
+```
+
 ### Configure Nginx and PHP-FPM
 
-- The default Nginx server configuration (app.conf) will expose your project `/public` folder.
-- If your project uses different directory structure, you should adjust the configuration and update the file accordingly.
+- 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`)
-- Supported PHP version: 7.4 & 8.0
+- Currently EasyDock-Linux only support 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.
 
 ```bash
 # APP PORT
@@ -64,15 +81,24 @@ APP_PORT=8008
 PHP_VERSION=7.4
 ```
 
+Everytime you change PHP version into `.env.easydock` file you have to run:
+
+```bash
+easydock reset && easydock build
+```
+
+_*PS: Resetting your EasyDock instance will delete the database data. You should backup your database before!*_
+
 ### Configure database connection
 
 The default database connection for MySQL and PostgreSQL.
 
 ```bash
+Database: easydockdb
 Username: easydock
 Password: secret
-Database: easydockdb
-Host: mysql ( or postgres for PostgreSQL )
+Root password: rootsecret
+Host name: mysql ( or postgres for PostgreSQL )
 ```
 
 For security reason, you should change the default database username and password configured in `.env.easydock` file.
@@ -106,66 +132,106 @@ host: mailhog
 port: 1025
 ```
 
-### To start your app instance
+## EasyDock Commands
+
+EasyDock comes with handy command line interface to manage your Docker containers. Execute the following commands inside your application directory.
+
+- Initialize EasyDock project.
+
+```bash
+easydock init
+```
+
+- Build EasyDock images
+
+```bash
+easydock build
+```
+
+- Start EasyDock application instance
 
 ```bash
 easydock up
 ```
 
-### To stop your app instance
+- Stop EasyDock application instance
 
 ```bash
 easydock stop
 ```
 
-### To restart your app instance
+- Restart EasyDock application instance
 
 ```bash
 easydock restart
 ```
 
-### To stop and delete your app instance
+- Take down (stop and delete) EasyDock instance
 
 ```bash
 easydock down
 ```
 
-### To "SSH" into your app instance
+- Access `ssh` into EasyDock application instance
 
 ```bash
 easydock shell
 ```
 
-### You can get application info using
+- Get EasyDock application details
 
 ```bash
 easydock info
 ```
 
-### You can reset your running instance
+- Hard reset running EasyDock instance
 
 ```bash
 easydock reset
 ```
 
-### Everytime you change PHP version into `.env.easydock` file you have to run
+## Security Vulnerabilities and Bugs
 
-```bash
-easydock reset && easydock build
-```
+If you discover any security vulnerability or any bug within _EasyDock Linux_, please open an issue.
 
-_*PS: Resetting your EasyDock instance will delete the database data*_
+## Awesome People
 
-## Security Vulnerabilities and Bugs
+**EasyDock Linux** is an open-source project licensed under the MIT license with its ongoing development made possible entirely by the support of all these smart and generous people, from code contributors to financial contributors. :purple_heart:
 
-If you discover any security vulnerability or any bug within easydock, please open an issue.
+Thank you for considering contributing to this project!
 
-## Contributing
+### Project Maintainers
 
-Thank you for considering contributing to this project!
+<table>
+  <tbody>
+    <tr>
+        <td align="center" valign="top">
+            <img width="125" height="125" src="https://github.com/joglomedia.png?s=150">
+            <br>
+            <strong>Edi Septriyanto</strong>
+            <br>
+            <a href="https://github.com/joglomedia">@joglomedia</a>
+        </td>
+     </tr>
+  </tbody>
+</table>
+
+### Code Contributors
+
+<a href="https://github.com/joglomedia/easydock-linux/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=joglomedia/easydock-linux" />
+</a>
+
+Made with [contributors-img](https://contrib.rocks).
+
+### Financial Contributors
+
+You can support us using any of the methods below:
+
+**[Buy Me a Bottle of Milk or a Cup of Coffee](https://paypal.me/masedi) !!**
 
 ## Licence
 
-Easydock is open-source software licensed under the MIT license.
+EasyDock Linux is open-source project licensed under the MIT license.
 
 ### Enjoy easydock ;)

LICENSE

@@ -61,6 +61,7 @@ RUN apk update && apk upgrade \
     pgsql \
     redis \
     soap \
+    swoole \
     xsl \
     zip \
 # Install composer

LICENSE.md

@@ -103,7 +103,7 @@ function ed_logo() {
 function ed_check_dependencies() {
     local PCKGS=''
 
-    for cmd in "certutil" "docker" "docker-compose"; do
+    for cmd in "docker" "docker-compose"; do
         local str=''
 
         if ! [[ -x "$(command -v ${cmd})" ]]; then
@@ -317,23 +317,24 @@ function ed_help() {
 }
 
 function ed_info() {
-    echo -e "${bgpurple}${white}${bold} easydock System Information ${reset}${br}"
+    echo -e "${bgpurple}${white}${bold} EasyDock System Information ${reset}${br}"
     echo "${bold}Application${reset}"
     echo "Name: ${ed_appsid}"
     echo "Path: ${ed_appsrc}"
-    echo "Document Root: /var/www/public"
+    echo "Document Root: /var/www"
     echo "Index File: index.php"
     if [ "${ed_portapp}" == "80" ]; then
         echo "Host: http://localhost"
     else
         echo "Host: http://localhost:${ed_portapp}"
     fi
     echo -e "Stack: php:${ed_phpver} + mariadb:latest + nginx:latest ${br}"
-    echo "${bold}MySQL${reset}"
-    echo "Host: mysql:${ed_portdb} (int) / 127.0.0.1:${ed_portdb} (ext)"
-    echo "Name: ${ed_dbname}"
-    echo "User: root"
-    echo -e "Pass: ${ed_dbpass} ${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 "DB Name: ${ed_dbname}"
+    echo "Username: ${ed_dbuser}"
+    echo -e "Password: ${ed_dbpass} ${br}"
     echo "${bold}SMTP${reset}"
     echo "Host: mailhog"
     echo "Port: 1025"
@@ -553,7 +554,7 @@ function ed_cli_menu() {
         *)
             shift
             ed_notfound "${menu}"
-            exit -1
+            exit 1
             ;;
         esac
         shift
@@ -602,7 +603,9 @@ function ed_bootstrap() {
         ed_phpver=$(grep PHP_V .env.easydock | cut -d '=' -f2)
         #ed_dbver=$(grep DB_VERS .env.easydock | cut -d '=' -f2)
         ed_dbname=$(grep DB_NAME .env.easydock | cut -d '=' -f2)
+        ed_dbuser=$(grep DB_USER .env.easydock | cut -d '=' -f2)
         ed_dbpass=$(grep DB_PASS .env.easydock | cut -d '=' -f2)
+        #ed_dbrootpass=$(grep DB_ROOT_PASS .env.easydock | cut -d '=' -f2)
         #ed_nginx=$(grep NGINX_MODE .env.easydock | cut -d '=' -f2)
 
         # Execute CLI command.