diff --git a/.github/stale.yml b/.github/stale.yml
index f3c36da..dfadd79 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,21 +1,21 @@
-# Configuration for probot-stale - https://github.com/probot/stale
+# Configuration for Github probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 180
+daysUntilStale: 90
# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 90
+daysUntilClose: 21
# Issues with these labels will never be considered stale
exemptLabels:
- 'Type: Feature Request'
# Label to use when marking an issue as stale
-staleLabel: stale
+staleLabel: Stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
- This issue has been automatically marked as stale because it has not had
- recent activity. It will be closed if no further activity occurs. Thank you
- for your contributions.
+ Hi 👋 this issue has been automatically marked as `stale` 📌 because it has not had recent activity 😴.
+ It will be closed if no further activity occurs. Thank you for your contributions ❤️.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
- This issue has been automatically closed because it had not recent activity during the stale period.
+ Hi again 👋 we would like to inform you that this issue has been automatically `closed` 🔒 because it had not recent activity during the `stale` period.
+ We really really appreciate your contributions, and looking forward for more in the future 🎈.
# Limit to only `issues` or `pulls`
only: issues
diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 9112767..701058a 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -2122,6 +2122,25 @@ AST exposes the abstract syntax tree generated by PHP 7+. This extension is requ
+
+
+## Install Git Bash Prompt
+A bash prompt that displays information about the current git repository. In particular the branch name, difference with remote branch, number of files staged, changed, etc.
+
+1 - Open the `.env` file
+
+2 - Search for the `WORKSPACE_INSTALL_GIT_PROMPT` argument under the Workspace Container
+
+3 - Set it to `true`
+
+4 - Re-build the container `docker-compose build workspace`
+
+**Note** You can configure bash-git-prompt by editing the `workspace/gitprompt.sh` file and re-building the workspace container.
+For configuration information, visit the [bash-git-prompt repository](https://github.com/magicmonty/bash-git-prompt).
+
+
+
+
## PHPStorm Debugging Guide
diff --git a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/head.html b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/head.html
index 0953395..e890c0a 100644
--- a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/head.html
+++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/head.html
@@ -12,17 +12,23 @@
{{ .Title }}{{ if not .IsHome }} - {{ .Site.Title }}{{ end }}
{{ .Hugo.Generator }}
- {{ with .Site.Params.description }}
-
- {{ end }}
+ {{ with .Site.Params.description }}{{ end }}
- {{ with .Site.Params.author }}
-
- {{ end }}
+ {{ with .Site.Params.author }}{{ end }}
+
+ {{ with .Site.Title }}{{ end }}
+ {{ with .Site.Params.description }}{{ end }}
{{ with .Site.Title }}{{ end }}
{{ with .Site.Params.logo }}{{ end }}
+
+
+
+ {{ with .Site.Title }}{{ end }}
+ {{ with .Site.Params.description }}{{ end }}
+ {{ with .Site.Params.logo }}{{ end }}
+
{{ with .Site.Title }}{{ end }}
diff --git a/docker-compose.yml b/docker-compose.yml
index d72ffd4..79c31cc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,12 +64,13 @@ services:
- LARADOCK_PHP_VERSION=${PHP_VERSION}
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
- INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION}
+ - INSTALL_BZ2=${WORKSPACE_INSTALL_BZ2}
+ - INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
- INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
- INSTALL_PCOV=${WORKSPACE_INSTALL_PCOV}
- INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
- INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
- INSTALL_SSH2=${WORKSPACE_INSTALL_SSH2}
- - INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
- INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
- INSTALL_XSL=${WORKSPACE_INSTALL_XSL}
- INSTALL_LDAP=${WORKSPACE_INSTALL_LDAP}
@@ -125,6 +126,7 @@ services:
- INSTALL_AST=${WORKSPACE_INSTALL_AST}
- INSTALL_YAML=${WORKSPACE_INSTALL_YAML}
- INSTALL_MAILPARSE=${WORKSPACE_INSTALL_MAILPARSE}
+ - INSTALL_GIT_PROMPT=${WORKSPACE_INSTALL_GIT_PROMPT}
- PUID=${WORKSPACE_PUID}
- PGID=${WORKSPACE_PGID}
- CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}
@@ -167,6 +169,8 @@ services:
- CHANGE_SOURCE=${CHANGE_SOURCE}
- LARADOCK_PHP_VERSION=${PHP_VERSION}
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
+ - INSTALL_BZ2=${PHP_FPM_INSTALL_BZ2}
+ - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
- INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
- INSTALL_PCOV=${PHP_FPM_INSTALL_PCOV}
- INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
@@ -182,7 +186,6 @@ services:
- INSTALL_GEARMAN=${PHP_FPM_INSTALL_GEARMAN}
- INSTALL_MSSQL=${PHP_FPM_INSTALL_MSSQL}
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
- - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
- INSTALL_PHPREDIS=${PHP_FPM_INSTALL_PHPREDIS}
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
- INSTALL_OPCACHE=${PHP_FPM_INSTALL_OPCACHE}
@@ -248,8 +251,10 @@ services:
context: ./php-worker
args:
- CHANGE_SOURCE=${CHANGE_SOURCE}
- - PHP_VERSION=${PHP_VERSION}
+ - LARADOCK_PHP_VERSION=${PHP_VERSION}
- PHALCON_VERSION=${PHALCON_VERSION}
+ - INSTALL_BZ2=${PHP_WORKER_INSTALL_BZ2}
+ - INSTALL_GMP=${PHP_WORKER_INSTALL_GMP}
- INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
- INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH}
- INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON}
@@ -263,7 +268,6 @@ services:
- INSTALL_SWOOLE=${PHP_WORKER_INSTALL_SWOOLE}
- INSTALL_TAINT=${PHP_WORKER_INSTALL_TAINT}
- INSTALL_FFMPEG=${PHP_WORKER_INSTALL_FFMPEG}
- - INSTALL_GMP=${PHP_WORKER_INSTALL_GMP}
- INSTALL_REDIS=${PHP_WORKER_INSTALL_REDIS}
- PUID=${PHP_WORKER_PUID}
- PGID=${PHP_WORKER_PGID}
@@ -282,7 +286,9 @@ services:
context: ./laravel-horizon
args:
- CHANGE_SOURCE=${CHANGE_SOURCE}
- - PHP_VERSION=${PHP_VERSION}
+ - LARADOCK_PHP_VERSION=${PHP_VERSION}
+ - INSTALL_BZ2=${LARAVEL_HORIZON_INSTALL_BZ2}
+ - INSTALL_GMP=${LARAVEL_HORIZON_INSTALL_GMP}
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}
@@ -469,7 +475,10 @@ services:
### PostgreSQL ###########################################
postgres:
- build: ./postgres
+ build:
+ context: ./postgres
+ args:
+ - POSTGRES_VERSION=${POSTGRES_VERSION}
volumes:
- ${DATA_PATH_HOST}/postgres:/var/lib/postgresql/data
- ${POSTGRES_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d
@@ -775,7 +784,10 @@ services:
### ElasticSearch ########################################
elasticsearch:
- build: ./elasticsearch
+ build:
+ context: ./elasticsearch
+ args:
+ - ELK_VERSION=${ELK_VERSION}
volumes:
- elasticsearch:/usr/share/elasticsearch/data
environment:
@@ -799,7 +811,10 @@ services:
### Logstash ##############################################
logstash:
- build: ./logstash
+ build:
+ context: ./logstash
+ args:
+ - ELK_VERSION=${ELK_VERSION}
volumes:
- './logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml'
- './logstash/pipeline:/usr/share/logstash/pipeline'
@@ -817,7 +832,10 @@ services:
### Kibana ##############################################
kibana:
- build: ./kibana
+ build:
+ context: ./kibana
+ args:
+ - ELK_VERSION=${ELK_VERSION}
ports:
- "${KIBANA_HTTP_PORT}:5601"
depends_on:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index dcc2874..7d77e07 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,3 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.1.1
+ARG ELK_VERSION=7.5.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
EXPOSE 9200 9300
diff --git a/env-example b/env-example
index e0ab228..e6cb581 100644
--- a/env-example
+++ b/env-example
@@ -100,12 +100,13 @@ WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false
WORKSPACE_INSTALL_PHPREDIS=true
WORKSPACE_INSTALL_WORKSPACE_SSH=false
WORKSPACE_INSTALL_SUBVERSION=false
+WORKSPACE_INSTALL_BZ2=false
+WORKSPACE_INSTALL_GMP=false
WORKSPACE_INSTALL_XDEBUG=false
WORKSPACE_INSTALL_PCOV=false
WORKSPACE_INSTALL_PHPDBG=false
WORKSPACE_INSTALL_SSH2=false
WORKSPACE_INSTALL_LDAP=false
-WORKSPACE_INSTALL_GMP=false
WORKSPACE_INSTALL_SOAP=false
WORKSPACE_INSTALL_XSL=false
WORKSPACE_INSTALL_SMB=false
@@ -158,6 +159,7 @@ WORKSPACE_INSTALL_FFMPEG=false
WORKSPACE_INSTALL_GNU_PARALLEL=false
WORKSPACE_INSTALL_AST=true
WORKSPACE_AST_VERSION=1.0.3
+WORKSPACE_INSTALL_GIT_PROMPT=false
### PHP_FPM ###############################################
@@ -169,6 +171,8 @@ PHP_FPM_INSTALL_OPCACHE=true
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true
PHP_FPM_INSTALL_PHPREDIS=true
PHP_FPM_INSTALL_MEMCACHED=false
+PHP_FPM_INSTALL_BZ2=false
+PHP_FPM_INSTALL_GMP=false
PHP_FPM_INSTALL_XDEBUG=false
PHP_FPM_INSTALL_PCOV=false
PHP_FPM_INSTALL_XHPROF=false
@@ -183,7 +187,6 @@ PHP_FPM_INSTALL_MSSQL=false
PHP_FPM_INSTALL_SSH2=false
PHP_FPM_INSTALL_SOAP=false
PHP_FPM_INSTALL_XSL=false
-PHP_FPM_INSTALL_GMP=false
PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE=false
PHP_FPM_INSTALL_OCI8=false
@@ -219,6 +222,8 @@ PHP_FPM_PGID=1000
### PHP_WORKER ############################################
+PHP_WORKER_INSTALL_BZ2=false
+PHP_WORKER_INSTALL_GMP=false
PHP_WORKER_INSTALL_PGSQL=false
PHP_WORKER_INSTALL_BCMATH=false
PHP_WORKER_INSTALL_PHALCON=false
@@ -230,7 +235,6 @@ PHP_WORKER_INSTALL_GHOSTSCRIPT=false
PHP_WORKER_INSTALL_SWOOLE=false
PHP_WORKER_INSTALL_TAINT=false
PHP_WORKER_INSTALL_FFMPEG=false
-PHP_WORKER_INSTALL_GMP=false
PHP_WORKER_INSTALL_CASSANDRA=false
PHP_WORKER_INSTALL_GEARMAN=false
PHP_WORKER_INSTALL_REDIS=false
@@ -250,6 +254,8 @@ NGINX_SSL_PATH=./nginx/ssl/
### LARAVEL_HORIZON ################################################
+LARAVEL_HORIZON_INSTALL_BZ2=false
+LARAVEL_HORIZON_INSTALL_GMP=false
LARAVEL_HORIZON_INSTALL_SOCKETS=false
LARAVEL_HORIZON_INSTALL_YAML=false
LARAVEL_HORIZON_INSTALL_PHPREDIS=true
@@ -316,6 +322,7 @@ MARIADB_ENTRYPOINT_INITDB=./mariadb/docker-entrypoint-initdb.d
### POSTGRES ##############################################
+POSTGRES_VERSION=alpine
POSTGRES_DB=default
POSTGRES_USER=default
POSTGRES_PASSWORD=secret
@@ -850,3 +857,6 @@ GEARMAN_MYSQL_PASSWORD_FILE=
GEARMAN_MYSQL_DB=Gearmand
# Table to use by Gearman (Default: gearman_queue)
GEARMAN_MYSQL_TABLE=gearman_queue
+
+### ELK Stack ##################################################
+ELK_VERSION=7.5.1
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index b831d6d..46ef653 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,3 +1,4 @@
-FROM docker.elastic.co/kibana/kibana:7.1.1
+ARG ELK_VERSION=7.5.1
+FROM docker.elastic.co/kibana/kibana:${ELK_VERSION}
EXPOSE 5601
diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile
index 49d0495..e8ca7ab 100644
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -4,11 +4,13 @@
#--------------------------------------------------------------------------
#
-ARG PHP_VERSION=${PHP_VERSION}
-FROM php:${PHP_VERSION}-alpine
+ARG LARADOCK_PHP_VERSION
+FROM php:${LARADOCK_PHP_VERSION}-alpine
LABEL maintainer="Mahmoud Zalt "
+ARG LARADOCK_PHP_VERSION
+
# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
ARG CHANGE_SOURCE=false
@@ -44,6 +46,20 @@ ENV PGID ${PGID}
RUN addgroup -g ${PGID} laradock && \
adduser -D -G laradock -u ${PUID} laradock
+#Install BZ2:
+ARG INSTALL_BZ2=false
+RUN if [ ${INSTALL_BZ2} = true ]; then \
+ apk --update add bzip2-dev; \
+ docker-php-ext-install bz2 \
+;fi
+
+#Install GMP package:
+ARG INSTALL_GMP=false
+RUN if [ ${INSTALL_GMP} = true ]; then \
+ apk add --update --no-cache gmp gmp-dev; \
+ docker-php-ext-install gmp \
+;fi
+
#Install BCMath package:
ARG INSTALL_BCMATH=false
RUN if [ ${INSTALL_BCMATH} = true ]; then \
@@ -63,12 +79,6 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
&& docker-php-ext-install pdo_pgsql \
;fi
-# Install Cassandra drivers:
-ARG INSTALL_CASSANDRA=false
-RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
- apk --update add cassandra-cpp-driver \
- ;fi
-
# Install PhpRedis package:
ARG INSTALL_PHPREDIS=false
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
@@ -84,6 +94,12 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
apk add ffmpeg \
;fi
+# Install Cassandra drivers:
+ARG INSTALL_CASSANDRA=false
+RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
+ apk --update add cassandra-cpp-driver \
+ ;fi
+
WORKDIR /usr/src
RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
git clone https://github.com/datastax/php-driver.git \
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index a8c5452..161d381 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,4 +1,5 @@
-FROM docker.elastic.co/logstash/logstash:6.4.2
+ARG ELK_VERSION=7.5.1
+FROM docker.elastic.co/logstash/logstash:${ELK_VERSION}
USER root
RUN rm -f /usr/share/logstash/pipeline/logstash.conf
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 03bb15c..870a5e4 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -1,4 +1,4 @@
-ARG MYSQL_VERSION=latest
+ARG MYSQL_VERSION
FROM mysql:${MYSQL_VERSION}
LABEL maintainer="Mahmoud Zalt "
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 1d6a8bf..b3246ed 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -13,7 +13,6 @@
#
ARG LARADOCK_PHP_VERSION
-
FROM laradock/php-fpm:2.7-${LARADOCK_PHP_VERSION}
LABEL maintainer="Mahmoud Zalt "
@@ -71,6 +70,31 @@ RUN set -xe; \
# - INSTALL_SOAP=true
#
+###########################################################################
+# BZ2:
+###########################################################################
+
+ARG INSTALL_BZ2=false
+RUN if [ ${INSTALL_BZ2} = true ]; then \
+ apt-get -y install libbz2-dev; \
+ docker-php-ext-install bz2 \
+;fi
+
+###########################################################################
+# GMP (GNU Multiple Precision):
+###########################################################################
+
+ARG INSTALL_GMP=false
+
+RUN if [ ${INSTALL_GMP} = true ]; then \
+ # Install the GMP extension
+ apt-get install -y libgmp-dev && \
+ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+ ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \
+ ;fi && \
+ docker-php-ext-install gmp \
+;fi
+
###########################################################################
# SSH2:
###########################################################################
@@ -194,7 +218,6 @@ RUN if [ ${INSTALL_PCOV} = true ]; then \
;fi \
;fi
-
###########################################################################
# Phpdbg:
###########################################################################
@@ -330,7 +353,7 @@ ARG INSTALL_AMQP=false
RUN if [ ${INSTALL_AMQP} = true ]; then \
# download and install manually, to make sure it's compatible with ampq installed by pecl later
# install cmake first
- apt-get update && apt-get -y install cmake && \
+ apt-get -y install cmake && \
curl -L -o /tmp/rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/master.tar.gz && \
mkdir -p rabbitmq-c && \
tar -C rabbitmq-c -zxvf /tmp/rabbitmq-c.tar.gz --strip 1 && \
@@ -352,7 +375,6 @@ RUN if [ ${INSTALL_AMQP} = true ]; then \
ARG INSTALL_GEARMAN=false
RUN if [ ${INSTALL_GEARMAN} = true ]; then \
- apt-get update && \
apt-get -y install libgearman-dev && \
cd /tmp && \
curl -L https://github.com/wcgallego/pecl-gearman/archive/gearman-2.0.5.zip -O && \
@@ -390,21 +412,6 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \
docker-php-ext-install bcmath \
;fi
-###########################################################################
-# GMP (GNU Multiple Precision):
-###########################################################################
-
-ARG INSTALL_GMP=false
-
-RUN if [ ${INSTALL_GMP} = true ]; then \
- # Install the GMP extension
- apt-get install -y libgmp-dev && \
- if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
- ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \
- ;fi && \
- docker-php-ext-install gmp \
-;fi
-
###########################################################################
# PHP Memcached:
###########################################################################
@@ -799,7 +806,6 @@ USER root
ARG INSTALL_MYSQL_CLIENT=false
RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
- apt-get update -yqq && \
if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \
apt-get -y install default-mysql-client \
;else \
@@ -816,7 +822,6 @@ USER root
ARG INSTALL_PING=false
RUN if [ ${INSTALL_PING} = true ]; then \
- apt-get update -yqq && \
apt-get -y install inetutils-ping \
;fi
@@ -829,7 +834,6 @@ USER root
ARG INSTALL_SSHPASS=false
RUN if [ ${INSTALL_SSHPASS} = true ]; then \
- apt-get update -yqq && \
apt-get -y install sshpass \
;fi
@@ -842,7 +846,6 @@ USER root
ARG INSTALL_FFMPEG=false
RUN if [ ${INSTALL_FFMPEG} = true ]; then \
- apt-get update -yqq && \
apt-get -y install ffmpeg \
;fi
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index d9733e5..4717054 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -4,11 +4,13 @@
#--------------------------------------------------------------------------
#
-ARG PHP_VERSION=${PHP_VERSION}
-FROM php:${PHP_VERSION}-alpine
+ARG LARADOCK_PHP_VERSION
+FROM php:${LARADOCK_PHP_VERSION}-alpine
LABEL maintainer="Mahmoud Zalt "
+ARG LARADOCK_PHP_VERSION
+
# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
ARG CHANGE_SOURCE=false
@@ -44,6 +46,20 @@ ENV PGID ${PGID}
RUN addgroup -g ${PGID} laradock && \
adduser -D -G laradock -u ${PUID} laradock
+#Install BZ2:
+ARG INSTALL_BZ2=false
+RUN if [ ${INSTALL_BZ2} = true ]; then \
+ apk --update add bzip2-dev; \
+ docker-php-ext-install bz2; \
+fi
+
+#Install GMP package:
+ARG INSTALL_GMP=false
+RUN if [ ${INSTALL_GMP} = true ]; then \
+ apk add --update --no-cache gmp gmp-dev \
+ && docker-php-ext-install gmp \
+;fi
+
#Install SOAP package:
ARG INSTALL_SOAP=false
RUN if [ ${INSTALL_SOAP} = true ]; then \
@@ -65,9 +81,14 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
# Install ZipArchive:
ARG INSTALL_ZIP_ARCHIVE=false
-RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
+RUN set -eux; \
+ if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
apk --update add libzip-dev && \
- docker-php-ext-configure zip --with-libzip && \
+ if [ ${LARADOCK_PHP_VERSION} = "7.3" ] || [ ${LARADOCK_PHP_VERSION} = "7.4" ]; then \
+ docker-php-ext-configure zip; \
+ else \
+ docker-php-ext-configure zip --with-libzip; \
+ fi && \
# Install the zip extension
docker-php-ext-install zip \
;fi
@@ -75,7 +96,7 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
# Install MySQL Client:
ARG INSTALL_MYSQL_CLIENT=false
RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
- if [ ${PHP_VERSION} = "7.3" ]; then \
+ if [ ${LARADOCK_PHP_VERSION} = "7.3" ]; then \
apk --update add default-mysql-client \
;else \
apk --update add mysql-client \
@@ -148,13 +169,6 @@ RUN if [ $INSTALL_GHOSTSCRIPT = true ]; then \
apk --update add ghostscript \
;fi
-#Install GMP package:
-ARG INSTALL_GMP=false
-RUN if [ ${INSTALL_GMP} = true ]; then \
- apk add --update --no-cache gmp gmp-dev \
- && docker-php-ext-install gmp \
-;fi
-
# Install Redis package:
ARG INSTALL_REDIS=false
RUN if [ ${INSTALL_REDIS} = true ]; then \
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index b5f121c..67b5ea2 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -1,6 +1,5 @@
-FROM postgres:alpine
-
-LABEL maintainer="Ben M "
+ARG POSTGRES_VERSION=alpine
+FROM postgres:${POSTGRES_VERSION}
CMD ["postgres"]
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 6223e0a..267cc16 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -13,7 +13,6 @@
#
ARG LARADOCK_PHP_VERSION
-
FROM laradock/workspace:2.6.1-${LARADOCK_PHP_VERSION}
LABEL maintainer="Mahmoud Zalt "
@@ -234,20 +233,16 @@ RUN if [ ${INSTALL_WP_CLI} = true ]; then \
;fi
###########################################################################
-# SSH2:
+# BZ2:
###########################################################################
-USER root
-
-ARG INSTALL_SSH2=false
-
-RUN if [ ${INSTALL_SSH2} = true ]; then \
- # Install the PHP SSH2 extension
- apt-get -y install libssh2-1-dev php${LARADOCK_PHP_VERSION}-ssh2 \
+ARG INSTALL_BZ2=false
+RUN if [ ${INSTALL_BZ2} = true ]; then \
+ apt-get -y install php${LARADOCK_PHP_VERSION}-bz2 \
;fi
###########################################################################
-# GMP:
+# GMP (GNU Multiple Precision):
###########################################################################
USER root
@@ -260,6 +255,19 @@ RUN if [ ${INSTALL_GMP} = true ]; then \
apt-get -y install php${LARADOCK_PHP_VERSION}-gmp \
;fi
+###########################################################################
+# SSH2:
+###########################################################################
+
+USER root
+
+ARG INSTALL_SSH2=false
+
+RUN if [ ${INSTALL_SSH2} = true ]; then \
+ # Install the PHP SSH2 extension
+ apt-get -y install libssh2-1-dev php${LARADOCK_PHP_VERSION}-ssh2 \
+;fi
+
###########################################################################
# SOAP:
###########################################################################
@@ -1253,6 +1261,19 @@ RUN if [ ${INSTALL_GNU_PARALLEL} = true ]; then \
apt-get -y install parallel \
;fi
+###########################################################################
+# Bash Git Prompt
+###########################################################################
+
+ARG INSTALL_GIT_PROMPT=false
+
+COPY git-prompt.sh /tmp/git-prompt
+
+RUN if [ ${INSTALL_GIT_PROMPT} = true ]; then \
+ git clone https://github.com/magicmonty/bash-git-prompt.git /root/.bash-git-prompt --depth=1 && \
+ cat /tmp/git-prompt >> /root/.bashrc && \
+ rm /tmp/git-prompt \
+;fi
###########################################################################
# Check PHP version:
diff --git a/workspace/git-prompt.sh b/workspace/git-prompt.sh
new file mode 100644
index 0000000..374e9fa
--- /dev/null
+++ b/workspace/git-prompt.sh
@@ -0,0 +1,24 @@
+# Settings info at https://github.com/magicmonty/bash-git-prompt
+if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
+ # Set config variables first
+ GIT_PROMPT_ONLY_IN_REPO=1
+ GIT_PROMPT_FETCH_REMOTE_STATUS=0 # uncomment to avoid fetching remote status
+ GIT_PROMPT_IGNORE_SUBMODULES=1 # uncomment to avoid searching for changed files in submodules
+ # GIT_PROMPT_WITH_VIRTUAL_ENV=0 # uncomment to avoid setting virtual environment infos for node/python/conda environments
+
+ # GIT_PROMPT_SHOW_UPSTREAM=1 # uncomment to show upstream tracking branch
+ # GIT_PROMPT_SHOW_UNTRACKED_FILES=normal # can be no, normal or all; determines counting of untracked files
+
+ # GIT_PROMPT_SHOW_CHANGED_FILES_COUNT=0 # uncomment to avoid printing the number of changed files
+
+ # GIT_PROMPT_STATUS_COMMAND=gitstatus_pre-1.7.10.sh # uncomment to support Git older than 1.7.10
+
+ # GIT_PROMPT_START=... # uncomment for custom prompt start sequence
+ # GIT_PROMPT_END=... # uncomment for custom prompt end sequence
+
+ # as last entry source the gitprompt script
+ # GIT_PROMPT_THEME=Custom # use custom theme specified in file GIT_PROMPT_THEME_FILE (default ~/.git-prompt-colors.sh)
+ # GIT_PROMPT_THEME_FILE=~/.git-prompt-colors.sh
+ # GIT_PROMPT_THEME=Solarized # use theme optimized for solarized color scheme
+ source $HOME/.bash-git-prompt/gitprompt.sh
+fi