Merge pull request #3 from laradock/master

catch up
This commit is contained in:
A.P. deBROUWER 2020-09-21 17:12:36 +02:00 committed by GitHub
commit 0459981135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 84 additions and 3 deletions

View File

@ -2284,6 +2284,26 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
**Note** You can configure Oh My ZSH by editing the `/home/laradock/.zshrc` in running container. **Note** You can configure Oh My ZSH by editing the `/home/laradock/.zshrc` in running container.
> With the ZSH autosuggestions plugin.
[ZSH autosuggestions plugin](https://github.com/zsh-users/zsh-autosuggestions) suggests commands as you type based on history and completions.
1 - Enable ZSH as described previously
2 - Set `SHELL_OH_MY_ZSH_AUTOSUGESTIONS` to `true`
3 - Rebuild and use ZSH as described previously
> With bash aliases loaded.
Laradock provides aliases through the `aliases.sh` file located in the `laradock/workspace` directory. You can load it into ZSH.
1 - Enable ZSH as described previously
2 - Set `SHELL_OH_MY_ZSH_ALIASES` to `true`
3 - Rebuild and enjoy aliases
<br> <br>
<a name="phpstorm-debugging"></a> <a name="phpstorm-debugging"></a>
## PHPStorm Debugging Guide ## PHPStorm Debugging Guide

View File

@ -134,10 +134,11 @@ That's it! enjoy :)
- PHP Worker - PHP Worker
- Laravel Horizon - Laravel Horizon
- Gearman - Gearman
- Amazon Simple Queue Service
- **Mail Servers:** - **Mail Servers:**
- Mailu - Mailu
- Mailcatcher - MailCatcher
- Mailhog - Mailhog
- MailDev - MailDev

View File

@ -63,6 +63,8 @@ services:
args: args:
- CHANGE_SOURCE=${CHANGE_SOURCE} - CHANGE_SOURCE=${CHANGE_SOURCE}
- SHELL_OH_MY_ZSH=${SHELL_OH_MY_ZSH} - SHELL_OH_MY_ZSH=${SHELL_OH_MY_ZSH}
- SHELL_OH_MY_ZSH_AUTOSUGESTIONS=${SHELL_OH_MY_ZSH_AUTOSUGESTIONS}
- SHELL_OH_MY_ZSH_ALIASES=${SHELL_OH_MY_ZSH_ALIASES}
- UBUNTU_SOURCE=${UBUNTU_SOURCE} - UBUNTU_SOURCE=${UBUNTU_SOURCE}
- BASE_IMAGE_TAG_PREFIX=${WORKSPACE_BASE_IMAGE_TAG_PREFIX} - BASE_IMAGE_TAG_PREFIX=${WORKSPACE_BASE_IMAGE_TAG_PREFIX}
- LARADOCK_PHP_VERSION=${PHP_VERSION} - LARADOCK_PHP_VERSION=${PHP_VERSION}
@ -246,6 +248,7 @@ services:
- INSTALL_WKHTMLTOPDF=${PHP_FPM_INSTALL_WKHTMLTOPDF} - INSTALL_WKHTMLTOPDF=${PHP_FPM_INSTALL_WKHTMLTOPDF}
- INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF} - INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF}
- INSTALL_XMLRPC=${PHP_FPM_INSTALL_XMLRPC} - INSTALL_XMLRPC=${PHP_FPM_INSTALL_XMLRPC}
- DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=${PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL}
- PUID=${PHP_FPM_PUID} - PUID=${PHP_FPM_PUID}
- PGID=${PHP_FPM_PGID} - PGID=${PHP_FPM_PGID}
- LOCALE=${PHP_FPM_DEFAULT_LOCALE} - LOCALE=${PHP_FPM_DEFAULT_LOCALE}
@ -663,6 +666,20 @@ services:
networks: networks:
- backend - backend
### SQS #############################################
sqs:
build: ./sqs
ports:
- "${SQS_NODE_HOST_PORT}:9324"
- "${SQS_MANAGEMENT_HTTP_HOST_PORT}:9325"
privileged: true
hostname: laradock-sqs
volumes:
- ${DATA_PATH_HOST}/sqs:/opt/custom
networks:
- frontend
- backend
### RabbitMQ ############################################# ### RabbitMQ #############################################
rabbitmq: rabbitmq:
build: ./rabbitmq build: ./rabbitmq
@ -921,7 +938,7 @@ services:
networks: networks:
- frontend - frontend
### Mailcatcher ################################################ ### MailCatcher ################################################
mailcatcher: mailcatcher:
build: ./mailcatcher build: ./mailcatcher
ports: ports:

View File

@ -83,6 +83,8 @@ DOCKER_SYNC_STRATEGY=native_osx
# If you want to use "Oh My ZSH!" with Laravel autocomplete plugin, set SHELL_OH_MY_ZSH to true. # If you want to use "Oh My ZSH!" with Laravel autocomplete plugin, set SHELL_OH_MY_ZSH to true.
SHELL_OH_MY_ZSH=false SHELL_OH_MY_ZSH=false
SHELL_OH_MY_ZSH_AUTOSUGESTIONS=false
SHELL_OH_MY_ZSH_ALIASES=false
########################################################### ###########################################################
################ Containers Customization ################# ################ Containers Customization #################
@ -365,6 +367,11 @@ POSTGRES_PASSWORD=secret
POSTGRES_PORT=5432 POSTGRES_PORT=5432
POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d
### SQS ##############################################
SQS_NODE_HOST_PORT=9324
SQS_MANAGEMENT_HTTP_HOST_PORT=9325
### RABBITMQ ############################################## ### RABBITMQ ##############################################
RABBITMQ_NODE_HOST_PORT=5672 RABBITMQ_NODE_HOST_PORT=5672

View File

@ -921,6 +921,18 @@ RUN if [ ${INSTALL_XMLRPC} = true ]; then \
docker-php-ext-install xmlrpc \ docker-php-ext-install xmlrpc \
;fi ;fi
###########################################################################
# Downgrade Openssl:
###########################################################################
ARG DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false
RUN if [ ${DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL} = true ]; then \
sed -i 's,^\(MinProtocol[ ]*=\).*,\1'TLSv1.2',g' /etc/ssl/openssl.cnf \
&& \
sed -i 's,^\(CipherString[ ]*=\).*,\1'DEFAULT@SECLEVEL=1',g' /etc/ssl/openssl.cnf\
;fi
########################################################################### ###########################################################################
# Check PHP version: # Check PHP version:
########################################################################### ###########################################################################

7
sqs/Dockerfile Normal file
View File

@ -0,0 +1,7 @@
FROM roribio16/alpine-sqs
LABEL maintainer="Ronald E. Oribio R. https://github.com/roribio"
ENTRYPOINT ["bash", "-c", "/usr/bin/supervisord"]
EXPOSE 9324 9325

View File

@ -1424,6 +1424,9 @@ RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \
apt install -y zsh \ apt install -y zsh \
;fi ;fi
ARG SHELL_OH_MY_ZSH_AUTOSUGESTIONS=false
ARG SHELL_OH_MY_ZSH_ALIASES=false
USER laradock USER laradock
RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \ RUN if [ ${SHELL_OH_MY_ZSH} = true ]; then \
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --keep-zshrc" && \ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --keep-zshrc" && \
@ -1439,7 +1442,21 @@ bindkey "^[[3~" delete-char\n\
bindkey "^[[4~" end-of-line\n\ bindkey "^[[4~" end-of-line\n\
bindkey "^[[5~" up-line-or-history\n\ bindkey "^[[5~" up-line-or-history\n\
bindkey "^[[6~" down-line-or-history\n\ bindkey "^[[6~" down-line-or-history\n\
bindkey "^?" backward-delete-char\n' >> /home/laradock/.zshrc \ bindkey "^?" backward-delete-char\n' >> /home/laradock/.zshrc && \
if [ ${SHELL_OH_MY_ZSH_AUTOSUGESTIONS} = true ]; then \
sh -c "git clone https://github.com/zsh-users/zsh-autosuggestions /home/laradock/.oh-my-zsh/custom/plugins/zsh-autosuggestions" && \
sed -i 's~plugins=(~plugins=(zsh-autosuggestions ~g' /home/laradock/.zshrc && \
sed -i '1iZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20' /home/laradock/.zshrc && \
sed -i '1iZSH_AUTOSUGGEST_STRATEGY=(history completion)' /home/laradock/.zshrc && \
sed -i '1iZSH_AUTOSUGGEST_USE_ASYNC=1' /home/laradock/.zshrc && \
sed -i '1iTERM=xterm-256color' /home/laradock/.zshrc \
;fi && \
if [ ${SHELL_OH_MY_ZSH_ALIASES} = true ]; then \
echo "" >> /home/laradock/.zshrc && \
echo "# Load Custom Aliases" >> /home/laradock/.zshrc && \
echo "source /home/laradock/aliases.sh" >> /home/laradock/.zshrc && \
echo "" >> /home/laradock/.zshrc \
;fi \
;fi ;fi
USER root USER root