+
+
+
Full PHP development environment based on Docker.
+ +
+ 
+
+
+ 
+
+
+
+
Full PHP development environment based on Docker.
+ +
+
+
+
+
+
+
+[![Laradock Contributors][contributors-src]][contributors-href]
+
+### Financial Contributors
+
+[![Open Collective backers][backers-src]][backers-href]
+
+You can support us using any of the methods below:
+
+1: [Open Collective](https://opencollective.com/laradock/contribute)
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Sponsoring is an act of giving in a different fashion. 🌱
-Support Laradock with your [organization](https://opencollective.com/laradock/contribute/).
+
+### Gold Sponsors
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/README.md b/README.md
index 2007e774..37f20dc1 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,6 @@
----
-
-Full PHP development environment based on Docker.
- -Supporting a variety of common services, all pre-configured to provide a full PHP development environment.
-
@@ -17,13 +11,16 @@
Full PHP development environment based on Docker.
+
-
+
+[![Laradock Contributors][contributors-src]][contributors-href]
### Financial Contributors
-Contribute and help us sustain the project.
+[![Open Collective backers][backers-src]][backers-href]
-Option 1: Donate via [Paypal](https://paypal.me/mzmmzz).
+You can support us using any of the methods below:
+
+1: [Open Collective](https://opencollective.com/laradock/contribute)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Sponsoring is an act of giving in a different fashion. 🌱
-Support Laradock with your [organization](https://opencollective.com/laradock/contribute/).
+### Gold Sponsors
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+2: Email us at support@laradock.io.
+*Sponsors logos are displayed on the [github repository](https://github.com/laradock/laradock/) page and the [documentation website](http://laradock.io/) home page.*
## License
[MIT](https://github.com/laradock/laradock/blob/master/LICENSE) © Mahmoud Zalt
+
+
+[comment]: # (Open Collective Tiers)
+
+[contributors-src]: https://opencollective.com/laradock/contributors.svg?width=890&button=false&isActive=true
+[contributors-href]: https://github.com/laradock/laradock/graphs/contributors
+[backers-src]: https://opencollective.com/laradock/tiers/awesome-backers.svg?width=890&button=false&isActive=true
+[backers-href]: https://opencollective.com/laradock#contributors
+
+[gold-sponsors-src]: https://opencollective.com/laradock/tiers/gold-sponsors.svg?avatarHeight=80&width=890&button=false&isActive=true
+[gold-sponsors-href]: https://opencollective.com/laradock#contributors
+[silver-sponsors-src]: https://opencollective.com/laradock/tiers/silver-sponsors.svg?avatarHeight=64&width=890&button=false&isActive=true
+[silver-sponsors-href]: https://opencollective.com/laradock#contributors
+[bronze-sponsors-src]: https://opencollective.com/laradock/tiers/bronze-sponsors.svg?avatarHeight=48&width=890&button=false&isActive=true
+[bronze-sponsors-href]: https://opencollective.com/laradock#contributors
+
+
diff --git a/certbot/run-certbot.sh b/certbot/run-certbot.sh
index 26be75c7..c66ba2c5 100644
--- a/certbot/run-certbot.sh
+++ b/certbot/run-certbot.sh
@@ -2,5 +2,6 @@
letsencrypt certonly --webroot -w /var/www/letsencrypt -d "$CN" --agree-tos --email "$EMAIL" --non-interactive --text
-cp /etc/letsencrypt/archive/"$CN"/cert1.pem /var/certs/cert1.pem
-cp /etc/letsencrypt/archive/"$CN"/privkey1.pem /var/certs/privkey1.pem
+cp /etc/letsencrypt/archive/"$CN"/cert1.pem /var/certs/"$CN"-cert1.pem
+cp /etc/letsencrypt/archive/"$CN"/privkey1.pem /var/certs/"$CN"-privkey1.pem
+
diff --git a/docker-compose.yml b/docker-compose.yml
index d0b0dcca..eabce3e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -151,6 +151,7 @@ services:
- INSTALL_POWERLINE=${WORKSPACE_INSTALL_POWERLINE}
- INSTALL_SUPERVISOR=${WORKSPACE_INSTALL_SUPERVISOR}
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
+ - INSTALL_AUDIOWAVEFORM=${WORKSPACE_INSTALL_AUDIOWAVEFORM}
- INSTALL_WKHTMLTOPDF=${WORKSPACE_INSTALL_WKHTMLTOPDF}
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
- INSTALL_LNAV=${WORKSPACE_INSTALL_LNAV}
@@ -245,6 +246,7 @@ services:
- INSTALL_PCNTL=${PHP_FPM_INSTALL_PCNTL}
- ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
- INSTALL_FFMPEG=${PHP_FPM_FFMPEG}
+ - INSTALL_AUDIOWAVEFORM=${PHP_FPM_AUDIOWAVEFORM}
- INSTALL_WKHTMLTOPDF=${PHP_FPM_INSTALL_WKHTMLTOPDF}
- INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
- INSTALL_XMLRPC=${PHP_FPM_INSTALL_XMLRPC}
@@ -303,6 +305,7 @@ services:
- INSTALL_SWOOLE=${PHP_WORKER_INSTALL_SWOOLE}
- INSTALL_TAINT=${PHP_WORKER_INSTALL_TAINT}
- INSTALL_FFMPEG=${PHP_WORKER_INSTALL_FFMPEG}
+ - INSTALL_AUDIOWAVEFORM=${PHP_WORKER_INSTALL_AUDIOWAVEFORM}
- INSTALL_REDIS=${PHP_WORKER_INSTALL_REDIS}
- INSTALL_IMAP=${PHP_WORKER_INSTALL_IMAP}
- INSTALL_XMLRPC=${PHP_WORKER_INSTALL_XMLRPC}
@@ -338,6 +341,7 @@ services:
- INSTALL_PHPREDIS=${LARAVEL_HORIZON_INSTALL_PHPREDIS}
- INSTALL_MONGO=${LARAVEL_HORIZON_INSTALL_MONGO}
- INSTALL_FFMPEG=${LARAVEL_HORIZON_INSTALL_FFMPEG}
+ - INSTALL_AUDIOWAVEFORM=${LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM}
- PUID=${LARAVEL_HORIZON_PUID}
- PGID=${LARAVEL_HORIZON_PGID}
volumes:
@@ -813,6 +817,10 @@ services:
context: ./adminer
args:
- INSTALL_MSSQL=${ADM_INSTALL_MSSQL}
+ environment:
+ - ADMINER_PLUGINS=${ADM_PLUGINS}
+ - ADMINER_DESIGN=${ADM_DESIGN}
+ - ADMINER_DEFAULT_SERVER=${ADM_DEFAULT_SERVER}
ports:
- "${ADM_PORT}:8080"
depends_on:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 7d77e070..2ed98015 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-ARG ELK_VERSION=7.5.1
+ARG ELK_VERSION
FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
EXPOSE 9200 9300
diff --git a/env-example b/env-example
index 2796e476..3b52a4b9 100644
--- a/env-example
+++ b/env-example
@@ -61,6 +61,10 @@ DOCKER_HOST_IP=10.0.75.1
# Choose a Remote Interpreter entry matching name. Default is `laradock`
PHP_IDE_CONFIG=serverName=laradock
+### PHP DOWNGRADEOPENSSL TLS AND SECLEVEL #################
+
+PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false
+
### Windows Path ##########################################
# A fix for Windows users, to ensure the application path works
@@ -170,6 +174,7 @@ WORKSPACE_CHROME_DRIVER_VERSION=2.42
WORKSPACE_TIMEZONE=UTC
WORKSPACE_SSH_PORT=2222
WORKSPACE_INSTALL_FFMPEG=false
+WORKSPACE_INSTALL_AUDIOWAVEFORM=false
WORKSPACE_INSTALL_WKHTMLTOPDF=false
WORKSPACE_INSTALL_GNU_PARALLEL=false
WORKSPACE_INSTALL_AST=true
@@ -240,6 +245,7 @@ PHP_FPM_INSTALL_SSHPASS=false
PHP_FPM_INSTALL_MAILPARSE=false
PHP_FPM_INSTALL_WKHTMLTOPDF=false
PHP_FPM_FFMPEG=false
+PHP_FPM_AUDIOWAVEFORM=false
PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8"
PHP_FPM_DEFAULT_LOCALE=POSIX
@@ -265,6 +271,7 @@ PHP_WORKER_INSTALL_GHOSTSCRIPT=false
PHP_WORKER_INSTALL_SWOOLE=false
PHP_WORKER_INSTALL_TAINT=false
PHP_WORKER_INSTALL_FFMPEG=false
+PHP_WORKER_INSTALL_AUDIOWAVEFORM=false
PHP_WORKER_INSTALL_CASSANDRA=false
PHP_WORKER_INSTALL_GEARMAN=false
PHP_WORKER_INSTALL_REDIS=false
@@ -296,6 +303,7 @@ LARAVEL_HORIZON_INSTALL_ZIP_ARCHIVE=false
LARAVEL_HORIZON_INSTALL_PHPREDIS=true
LARAVEL_HORIZON_INSTALL_MONGO=false
LARAVEL_HORIZON_INSTALL_FFMPEG=false
+LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM=false
LARAVEL_HORIZON_PGID=1000
LARAVEL_HORIZON_PUID=1000
@@ -424,6 +432,9 @@ MINIO_PORT=9000
ADM_PORT=8081
ADM_INSTALL_MSSQL=false
+ADM_PLUGINS=
+ADM_DESIGN=pepa-linha
+ADM_DEFAULT_SERVER=mysql
### PHP MY ADMIN ##########################################
@@ -916,4 +927,4 @@ GEARMAN_MYSQL_DB=Gearmand
GEARMAN_MYSQL_TABLE=gearman_queue
### ELK Stack ##################################################
-ELK_VERSION=7.5.1
+ELK_VERSION=7.9.1
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 46ef6539..adce23cb 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,4 +1,4 @@
-ARG ELK_VERSION=7.5.1
+ARG ELK_VERSION
FROM docker.elastic.co/kibana/kibana:${ELK_VERSION}
EXPOSE 5601
diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile
index d89cb705..38b2a695 100644
--- a/laravel-horizon/Dockerfile
+++ b/laravel-horizon/Dockerfile
@@ -56,7 +56,8 @@ RUN if [ ${INSTALL_BZ2} = true ]; then \
#Install GD package:
ARG INSTALL_GD=false
RUN if [ ${INSTALL_GD} = true ]; then \
- apk add --update --no-cache libpng-dev; \
+ apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/ && \
docker-php-ext-install gd \
;fi
@@ -125,6 +126,33 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
apk add ffmpeg \
;fi
+# Install BBC Audio Waveform Image Generator:
+ARG INSTALL_AUDIOWAVEFORM=false
+RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
+ apk add git make cmake gcc g++ libmad-dev libid3tag-dev libsndfile-dev gd-dev boost-dev libgd libpng-dev zlib-dev \
+ && apk add autoconf automake libtool gettext \
+ && wget https://github.com/xiph/flac/archive/1.3.3.tar.gz \
+ && tar xzf 1.3.3.tar.gz \
+ && cd flac-1.3.3 \
+ && ./autogen.sh \
+ && ./configure --enable-shared=no \
+ && make \
+ && make install \
+ && cd .. \
+ && git clone https://github.com/bbc/audiowaveform.git \
+ && cd audiowaveform \
+ && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \
+ && tar xzf release-1.10.0.tar.gz \
+ && ln -s googletest-release-1.10.0/googletest googletest \
+ && ln -s googletest-release-1.10.0/googlemock googlemock \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+;fi
+
+
# Install Cassandra drivers:
ARG INSTALL_CASSANDRA=false
RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 1a1a753c..cc862b21 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,4 +1,4 @@
-ARG ELK_VERSION=7.5.1
+ARG ELK_VERSION
FROM docker.elastic.co/logstash/logstash:${ELK_VERSION}
USER root
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index d05426d3..1837b452 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -857,6 +857,30 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
apt-get -y install ffmpeg \
;fi
+###########################################################################
+# BBC Audio Waveform Image Generator:
+###########################################################################
+
+USER root
+
+ARG INSTALL_AUDIOWAVEFORM=false
+
+RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
+ apt-get -y install git wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \
+ && git clone https://github.com/bbc/audiowaveform.git \
+ && cd audiowaveform \
+ && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \
+ && tar xzf release-1.10.0.tar.gz \
+ && ln -s googletest-release-1.10.0/googletest googletest \
+ && ln -s googletest-release-1.10.0/googlemock googlemock \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+;fi
+
+
#####################################
# wkhtmltopdf:
#####################################
diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile
index f3c8166d..084e2dd2 100644
--- a/php-worker/Dockerfile
+++ b/php-worker/Dockerfile
@@ -62,7 +62,8 @@ fi
#Install GD package:
ARG INSTALL_GD=false
RUN if [ ${INSTALL_GD} = true ]; then \
- apk add --update --no-cache libpng-dev; \
+ apk add --update --no-cache freetype-dev libjpeg-turbo-dev jpeg-dev libpng-dev; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr/lib/ --with-jpeg-dir=/usr/lib/ --with-png-dir=/usr/lib/ && \
docker-php-ext-install gd \
;fi
@@ -167,6 +168,33 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
apk --update add ffmpeg \
;fi
+# Install BBC Audio Waveform Image Generator:
+ARG INSTALL_AUDIOWAVEFORM=false
+RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
+ apk add git make cmake gcc g++ libmad-dev libid3tag-dev libsndfile-dev gd-dev boost-dev libgd libpng-dev zlib-dev \
+ && apk add autoconf automake libtool gettext \
+ && wget https://github.com/xiph/flac/archive/1.3.3.tar.gz \
+ && tar xzf 1.3.3.tar.gz \
+ && cd flac-1.3.3 \
+ && ./autogen.sh \
+ && ./configure --enable-shared=no \
+ && make \
+ && make install \
+ && cd .. \
+ && git clone https://github.com/bbc/audiowaveform.git \
+ && cd audiowaveform \
+ && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \
+ && tar xzf release-1.10.0.tar.gz \
+ && ln -s googletest-release-1.10.0/googletest googletest \
+ && ln -s googletest-release-1.10.0/googlemock googlemock \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+;fi
+
+
# Install AMQP:
ARG INSTALL_AMQP=false
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 2d0a70dd..0043dd80 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1305,6 +1305,30 @@ RUN if [ ${INSTALL_FFMPEG} = true ]; then \
apt-get -y install ffmpeg \
;fi
+
+###########################################################################
+# BBC Audio Waveform Image Generator:
+###########################################################################
+
+USER root
+
+ARG INSTALL_AUDIOWAVEFORM=false
+
+RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
+ apt-get -y install git wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \
+ && git clone https://github.com/bbc/audiowaveform.git \
+ && cd audiowaveform \
+ && wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \
+ && tar xzf release-1.10.0.tar.gz \
+ && ln -s googletest-release-1.10.0/googletest googletest \
+ && ln -s googletest-release-1.10.0/googlemock googlemock \
+ && mkdir build \
+ && cd build \
+ && cmake .. \
+ && make \
+ && make install \
+;fi
+
#####################################
# wkhtmltopdf:
#####################################
@@ -1404,7 +1428,9 @@ RUN if [ ${INSTALL_PROTOC} = true ]; then \
curl -L -o /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v${REAL_PROTOC_VERSION}/${PROTOC_ZIP} && \
unzip -q -o /tmp/protoc.zip -d /usr/local bin/protoc && \
unzip -q -o /tmp/protoc.zip -d /usr/local 'include/*' && \
- rm -f /tmp/protoc.zip \
+ rm -f /tmp/protoc.zip && \
+ chmod +x /usr/local/bin/protoc && \
+ chmod -R +r /usr/local/include/google \
;fi
###########################################################################
@@ -1461,6 +1487,36 @@ bindkey "^?" backward-delete-char\n' >> /home/laradock/.zshrc && \
USER root
+###########################################################################
+# ZSH User Aliases
+###########################################################################
+
+USER root
+
+COPY ./aliases.sh /root/aliases.sh
+COPY ./aliases.sh /home/laradock/aliases.sh
+
+RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \
+ sed -i 's/\r//' /root/aliases.sh && \
+ sed -i 's/\r//' /home/laradock/aliases.sh && \
+ chown laradock:laradock /home/laradock/aliases.sh && \
+ echo "" >> ~/.zshrc && \
+ echo "# Load Custom Aliases" >> ~/.zshrc && \
+ echo "source ~/aliases.sh" >> ~/.zshrc && \
+ echo "" >> ~/.zshrc \
+;fi
+
+USER laradock
+
+RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \
+ echo "" >> ~/.zshrc && \
+ echo "# Load Custom Aliases" >> ~/.zshrc && \
+ echo "source ~/aliases.sh" >> ~/.zshrc && \
+ echo "" >> ~/.zshrc \
+;fi
+
+USER root
+
#
#--------------------------------------------------------------------------
# Final Touch
+ 