Browse Source

* renaming xdebug scripts for non-conflicts name with user defined scripts in home directory starts with s and q

+ tail db general log bash helper
* correct path to xdebug2 config for previous php 74 version
- remove unnecessary laradock example crontab because this script moved crontab-example dir
* improve (un)create symlinks script logic
* use only newly composer auth path
master
dimti 1 year ago
parent
commit
dbe3a916f1
  1. 10
      bash/tail-db-general-log.sh
  2. 0
      bash/xdebug-quit.sh
  3. 0
      bash/xdebug-start.sh
  4. 12
      create-symlinks.sh
  5. 6
      docker-compose.base.yml
  6. 2
      dockerfiles/php-fpm/php74.Dockerfile
  7. 1
      dockerfiles/workspace/laradock.example
  8. 14
      uncreate-symlinks.sh

10
bash/tail-db-general-log.sh

@ -0,0 +1,10 @@
#!/bin/bash
DIR="$(realpath $(dirname "$(readlink -f "$0")")/..)"
GENERAL_LOG_FILE_PATH="${DIR}/log/mariadb/mariadb.log"
sudo truncate -s 0 $GENERAL_LOG_FILE_PATH
clear
sudo tail -f $GENERAL_LOG_FILE_PATH

0
bash/quit-xdebug.sh → bash/xdebug-quit.sh

0
bash/start-xdebug.sh → bash/xdebug-start.sh

12
create-symlinks.sh

@ -1,8 +1,10 @@
#!/bin/bash
DIR="$(realpath $(dirname "$(readlink -f "$0")"))"
ln -s ${DIR}/bash/start-xdebug.sh ${HOME}/
ln -s ${DIR}/bash/quit-xdebug.sh ${HOME}/
ln -s ${DIR}/bash/restart-nginx.sh ${HOME}/
ln -s ${DIR}/bash/mysql.sh ${HOME}/
ln -s ${DIR}/bash/enter-to-workspace.sh ${HOME}/
BASH_SCRIPTS_DIR="${DIR}/bash"
BASH_SCRIPTS=(ls $BASH_SCRIPTS_DIR)
for FILENAME in "${BASH_SCRIPTS[@]}"; do
ln -s ${BASH_SCRIPTS_DIR}/${FILENAME} ${HOME}/
done

6
docker-compose.base.yml

@ -53,7 +53,7 @@ services:
secrets:
- user_ssh_key
- user_known_hosts
- composer_auth2
- composer_auth
inbucket:
image: inbucket/inbucket
restart: always
@ -92,7 +92,5 @@ secrets:
file: ~/.ssh/id_rsa
user_known_hosts:
file: ~/.ssh/known_hosts
composer1_auth:
file: ~/.composer/auth.json
composer2_auth:
composer_auth:
file: ~/.config/composer/auth.json

2
dockerfiles/php-fpm/php74.Dockerfile

@ -30,7 +30,7 @@ RUN if [ ${INSTALL_PEAR_MAIL} = true ]; then \
###########################################################################
# Copy xdebug configuration for remote debugging
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
COPY ./xdebug2/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
###########################################################################
# Tune opts:

1
dockerfiles/workspace/laradock.example

@ -1 +0,0 @@
#* * * * * laradock /usr/bin/php /var/www/artisan schedule:run >> /dev/null 2>&1

14
uncreate-symlinks.sh

@ -1,6 +1,10 @@
#!/bin/bash
rm ${HOME}/start-xdebug.sh
rm ${HOME}/quit-xdebug.sh
rm ${HOME}/restart-nginx.sh
rm ${HOME}/mysql.sh
rm ${HOME}/enter-to-workspace.sh
DIR="$(realpath $(dirname "$(readlink -f "$0")"))"
BASH_SCRIPTS_DIR="${DIR}/bash"
BASH_SCRIPTS=(ls $BASH_SCRIPTS_DIR)
for FILENAME in "${BASH_SCRIPTS[@]}"; do
ln -s ${BASH_SCRIPTS_DIR}/${FILENAME} ${HOME}/
done
Loading…
Cancel
Save