Merge pull request #7 from joglomedia/linux

v1.0.3

Author: joglomedia

config/.env.easydock

@@ -23,19 +23,28 @@ APP_PORT=8008
 PHP_VERSION=8.0
 
 # MYSQL DB NAME
-DB_NAME=dockerdb
+DB_NAME=easydockdb
 
-# MYSQL ROOTPASSWORD
+# MYSQL USER
+DB_USER=easydock
+
+# MYSQL USER PASSWORD
 DB_PASS=secret
 
+# MYSQL ROOT PASSWORD
+DB_ROOT_PASS=rootsecret
+
 # MYSQL DB PORT
 DB_PORT=3306
 
 # REDIS PORT
-RDS_PORT=6379
+REDIS_PORT=6379
+
+# REDIS PASS
+REDIS_PASS=null
 
 # PHPMYADMIN PORT
 PMA_PORT=8080
 
 # MAILHOG PORT
-MH_PORT=8081
+MH_PORT=8025

src/Dockerfile

@@ -65,7 +65,7 @@ RUN apk update && apk upgrade \
 # Install composer
 &&  curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
 # Install node & npm (not yet required for php application)
-#&&  apk add --update nodejs npm \
+&&  apk add --no-cache nodejs npm yarn \
 # Add user
 &&  set -eux; \
     addgroup -g 1000 -S www; \

src/docker-compose.yml

@@ -25,7 +25,6 @@ services:
     image: nginx:alpine
     container_name: ${APP_SID}-nginx
     restart: always
-    tty: true
     ports:
       - ${APP_PORT}:80
     volumes:
@@ -38,25 +37,30 @@ services:
     image: yobasystems/alpine-mariadb:latest
     container_name: ${APP_SID}-mysql
     restart: always
-    tty: true
-    ports:
-      - ${DB_PORT}:3306
     environment:
       MYSQL_DATABASE: ${DB_NAME}
-      MYSQL_ROOT_PASSWORD: ${DB_PASS}
+      MYSQL_USER: ${DB_USER}
+      MYSQL_PASSWORD: ${DB_PASS}
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
+    expose:
+      - 3306
+    ports:
+      - ${DB_PORT}:3306
     command: ['--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci','--default-authentication-plugin=mysql_native_password']
     volumes:
       - ${APP_DIR}/.easydock/data:/var/lib/mysql/
 
   # Redis
   redis:
-    image: redis:latest
+    image: redis:alpine
     container_name: ${APP_SID}-redis
     restart: always
+    environment:
+      REDIS_PASSWORD: ${REDIS_PASS}
     expose:
       - 6379
     ports:
-      - ${RDS_PORT}:6379
+      - ${REDIS_PORT}:6379
 
   # PHPMyAdmin
   #phpmyadmin:
@@ -76,7 +80,7 @@ services:
     restart: always
     environment:
       ADMINER_DEFAULT_SERVER: mysql
-      MYSQL_ROOT_PASSWORD: ${DB_PASS}
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
     ports:
       - ${PMA_PORT}:8080
 

src/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.0.1                                               |
-# | Last Update       : 26/03/2021                                          |
+# | Version           : 1.0.3                                               |
+# | Last Update       : 14/04/2021                                          |
 # +-------------------------------------------------------------------------+
 # | EasyDock-Linux Copyright (c) 2021 MasEDI.Net                            |
 # | EasyDock's Logo & Name Copyright (c) Andrea Pollastri                   |
@@ -34,7 +34,7 @@ ED_USER=${USER:-$(id -u -n)}
 ED_CMD="bash easydock"
 
 # Sudo required commands.
-SUDO_CMDS="import reset"
+SUDO_CMDS="import remove reset"
 
 # EasyDock CLI source directory.
 SOURCE="${BASH_SOURCE[0]}"
@@ -214,7 +214,7 @@ function ed_notfound() {
 }
 
 function ed_isthisportfree() {
-    port="$1"
+    port="${1}"
     check=$(lsof -i "tcp:${port}")
     if [ -z "$check" ]; then
         return 0
@@ -224,18 +224,18 @@ function ed_isthisportfree() {
 }
 
 function ed_unavailableport() {
-    port=$1
+    port="${1}"
     echo -e "${bgwhite}${red}${bold} >>> ERROR! ${reset} Port: ${bgred}${white}${bold} ${port} ${reset} is used. Try another port. ${reset}${br}"
     exit
 }
 
 function ed_availableport() {
-    port=$1
+    port="${1}"
     echo "${green}${port} is available!${reset}"
 }
 
 function ed_checkingport() {
-    port=$1
+    port="${1}"
     echo -e "${br}${blue}Checking port ${port}...${reset}"
 }
 
@@ -558,9 +558,9 @@ function ed_bootstrap() {
 
         ed_portapp=$(grep APP_PORT .env.easydock | cut -d '=' -f2)
         ed_portdb=$(grep DB_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)
-        ed_portrds=$(grep RDS_PORT .env.easydock | cut -d '=' -f2)
         ed_appsid=$(grep APP_SID .env.easydock | cut -d '=' -f2)
         ed_appsrc=$(grep APP_DIR .env.easydock | cut -d '=' -f2)
         ed_phpver=$(grep PHP_V .env.easydock | cut -d '=' -f2)