Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the development environment #5

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update the development environment #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7932fba
Update Laradock
ngmy May 11, 2021
c264518
Update laradockctl
ngmy May 11, 2021
80e86b8
Add ignore = dirty
ngmy May 11, 2021
b983eb5
Update .gitignore
ngmy May 11, 2021
99703ff
Update tools
ngmy May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .envrc.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
export PATH=$PWD/laradockctl/bin:$PATH
export LARADOCKCTL_COMMAND_PATH=$PWD/.laradock/commands:$PWD/laradockctl/src/commands
export LARADOCKCTL_ADDITIONAL_COMMAND_DIRS=$PWD/.laradock/commands
export LARADOCKCTL_CONTAINER_NAMES=workspace
export LARADOCKCTL_ENV_FILE=$PWD/.laradock/env-development
export LARADOCKCTL_PHIVE_HOME_DIR_CONTAINER=.laradock/data/phive
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@
.php_cs.cache
.phpunit.result.cache
phpcs.xml
phpdoc.xml
phpstan.neon
phpunit.xml
psalm.xml
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[submodule "laradock"]
path = laradock
url = https://github.com/Laradock/laradock.git
ignore = dirty
[submodule "laradockctl"]
path = laradockctl
url = https://github.com/ngmy/laradockctl.git
Empty file added .laradock/commands/.gitkeep
View file
Open in desktop
Empty file.
14 changes: 0 additions & 14 deletions .laradock/commands/my/destroy.sh
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions .laradock/commands/my/down.sh
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions .laradock/commands/my/phive.sh
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions .laradock/commands/my/up.sh
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion .laradock/env-development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock-ngmy-phar-extractor
### PHP Version ###########################################

# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
PHP_VERSION=7.4

### Phalcon Version ###########################################
Expand Down Expand Up @@ -198,7 +198,9 @@ WORKSPACE_INSTALL_DOCKER_CLIENT=false
WORKSPACE_INSTALL_LNAV=false
WORKSPACE_INSTALL_PROTOC=false
WORKSPACE_INSTALL_PHPDECIMAL=false
WORKSPACE_INSTALL_ZOOKEEPER=false
WORKSPACE_PROTOC_VERSION=latest
WORKSPACE_INSTALL_MEMCACHED=true

### PHP_FPM ###############################################

Expand All @@ -213,6 +215,7 @@ PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true
PHP_FPM_INSTALL_PHPREDIS=true
PHP_FPM_INSTALL_MEMCACHED=false
PHP_FPM_INSTALL_BZ2=false
PHP_FPM_INSTALL_ENCHANT=false
PHP_FPM_INSTALL_GMP=false
PHP_FPM_INSTALL_GNUPG=false
PHP_FPM_INSTALL_XDEBUG=false
Expand Down Expand Up @@ -258,6 +261,7 @@ PHP_FPM_INSTALL_SSHPASS=false
PHP_FPM_INSTALL_MAILPARSE=false
PHP_FPM_INSTALL_WKHTMLTOPDF=false
PHP_FPM_INSTALL_PHPDECIMAL=false
PHP_FPM_INSTALL_ZOOKEEPER=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"
Expand All @@ -282,9 +286,11 @@ PHP_WORKER_INSTALL_IMAGEMAGICK=false
PHP_WORKER_IMAGEMAGICK_VERSION=latest
PHP_WORKER_INSTALL_GMP=false
PHP_WORKER_INSTALL_GNUPG=false
PHP_WORKER_INSTALL_LDAP=false
PHP_WORKER_INSTALL_PGSQL=false
PHP_WORKER_INSTALL_MONGO=false
PHP_WORKER_INSTALL_BCMATH=false
PHP_WORKER_INSTALL_MEMCACHED=false
# PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version
PHP_WORKER_INSTALL_OCI8=false
PHP_WORKER_INSTALL_PHALCON=false
Expand Down Expand Up @@ -322,6 +328,7 @@ LARAVEL_HORIZON_INSTALL_BZ2=false
LARAVEL_HORIZON_INSTALL_GD=false
LARAVEL_HORIZON_INSTALL_GMP=false
LARAVEL_HORIZON_INSTALL_GNUPG=false
LARAVEL_HORIZON_INSTALL_LDAP=false
LARAVEL_HORIZON_INSTALL_IMAGEMAGICK=false
LARAVEL_HORIZON_IMAGEMAGICK_VERSION=latest
LARAVEL_HORIZON_INSTALL_SOCKETS=false
Expand Down
6 changes: 3 additions & 3 deletions .phive/phars.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<phar name="humbug/box" version="^3.11.1" installed="3.12.2" location="./tools/box" copy="false"/>
<phar name="ngmy/phar-extractor" version="^0.1.0" installed="0.1.0" location="./tools/phar-extractor" copy="false"/>
<phar name="php-coveralls" version="^2.4.3" installed="2.4.3" location="./tools/php-coveralls" copy="false"/>
<phar name="php-cs-fixer" version="^2.18.2" installed="2.18.6" location="./tools/php-cs-fixer" copy="false"/>
<phar name="php-cs-fixer" version="^2.18.2" installed="2.19.0" location="./tools/php-cs-fixer" copy="false"/>
<phar name="phpcbf" version="^3.5.8" installed="3.6.0" location="./tools/phpcbf" copy="false"/>
<phar name="phpcs" version="^3.5.8" installed="3.6.0" location="./tools/phpcs" copy="false"/>
<phar name="phpdocumentor" version="^3.0.0" installed="3.0.0" location="./tools/phpDocumentor" copy="false"/>
<phar name="phpstan" version="^0.12.64" installed="0.12.84" location="./tools/phpstan" copy="false"/>
<phar name="phpstan" version="^0.12.64" installed="0.12.86" location="./tools/phpstan" copy="false"/>
<phar name="phpunit" version="^9.5.0" installed="9.5.4" location="./tools/phpunit" copy="false"/>
<phar name="psalm" version="^4.7.0" installed="4.7.0" location="./tools/psalm" copy="false"/>
<phar name="psalm" version="^4.7.0" installed="4.7.1" location="./tools/psalm" copy="false"/>
</phive>
2 changes: 1 addition & 1 deletion laradock
Open in desktop
Submodule laradock updated 21 files
+8 −1 .env.example
+11 −4 .github/workflows/main-ci.yml
+1 −1 .vscode/settings.json
+1 −1 DOCUMENTATION/content/contributing/index.md
+4 −4 DOCUMENTATION/content/getting-started/index.md
+2 −2 DOCUMENTATION/content/introduction/index.md
+1 −1 README-zh.md
+2 −0 certbot/run-certbot.sh
+34 −0 docker-compose.yml
+1 −1 ipython/Dockerfile.controller
+57 −44 laravel-horizon/Dockerfile
+1 −0 laravel-horizon/supervisord.d/laravel-horizon.conf.example
+52 −22 php-fpm/Dockerfile
+66 −30 php-worker/Dockerfile
+0 −0 postgres/docker-entrypoint-initdb.d/createdb.sh.example
+0 −0 postgres/docker-entrypoint-initdb.d/init_confluence_db.sh
+0 −0 postgres/docker-entrypoint-initdb.d/init_gitlab_db.sh
+0 −0 postgres/docker-entrypoint-initdb.d/init_jupyterhub_db.sh
+0 −0 postgres/docker-entrypoint-initdb.d/init_sonarqube_db.sh
+2 −10 travis-build.sh
+40 −1 workspace/Dockerfile
2 changes: 1 addition & 1 deletion laradockctl
Open in desktop
Submodule laradockctl updated 17 files
+30 −21 README.md
+3 −3 bin/laradockctl
+12 −0 src/commands/artisan.sh
+12 −0 src/commands/composer.sh
+24 −0 src/commands/destroy.sh
+12 −0 src/commands/down.sh
+0 −12 src/commands/laravel/artisan.sh
+0 −12 src/commands/laravel/logs.sh
+1 −1 src/commands/list.sh
+15 −0 src/commands/logs.sh
+12 −0 src/commands/npm.sh
+16 −0 src/commands/phive.sh
+94 −0 src/commands/up.sh
+0 −12 src/commands/workspace/composer.sh
+0 −12 src/commands/workspace/npm.sh
+107 −35 src/helpers.sh
+42 −68 src/logic.sh