Skip to content

Commit 961e332

Browse files
author
DKravtsov
committed
Updated composer dependencies, added fish shell, bash completion.
1 parent a98b43c commit 961e332

26 files changed

+1522
-1007
lines changed

.idea/htdocs.iml

+9-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/php-test-framework.xml

-14
This file was deleted.

Dockerfile

+14
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV
2525

2626
# install all the dependencies and enable PHP modules
2727
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
28+
bash-completion \
29+
fish \
2830
procps \
2931
nano \
3032
git \
@@ -80,6 +82,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
8082
RUN chmod +x /usr/bin/composer
8183
ENV COMPOSER_ALLOW_SUPERUSER 1
8284

85+
# Enable Composer autocompletion
86+
RUN composer completion bash > /etc/bash_completion.d/composer
87+
8388
# add supervisor
8489
RUN mkdir -p /var/log/supervisor
8590
COPY --chown=root:root ./docker/general/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
@@ -91,6 +96,15 @@ WORKDIR $APP_HOME
9196

9297
USER ${USERNAME}
9398

99+
# Add necessary stuff to bash autocomplete
100+
RUN echo 'source /usr/share/bash-completion/bash_completion' >> /home/${USERNAME}/.bashrc \
101+
&& echo 'alias console="/app/bin/console"' >> /home/${USERNAME}/.bashrc
102+
103+
# copy fish configs
104+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/completions/ /home/${USERNAME}/.config/fish/completions/
105+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/functions/ /home/${USERNAME}/.config/fish/functions/
106+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/config.fish /home/${USERNAME}/.config/fish/config.fish
107+
94108
# copy source files
95109
COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/
96110

Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ else
165165
$(ERROR_ONLY_FOR_HOST)
166166
endif
167167

168+
fish: ## Get fish shell inside symfony docker container
169+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
170+
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker compose $(PROJECT_NAME) exec $(OPTION_T) $(PHP_USER) symfony fish
171+
else
172+
$(ERROR_ONLY_FOR_HOST)
173+
endif
174+
168175
ssh-nginx: ## Get bash inside nginx docker container
169176
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
170177
@HOST_UID=$(HOST_UID) HOST_GID=$(HOST_GID) WEB_PORT_HTTP=$(WEB_PORT_HTTP) WEB_PORT_SSL=$(WEB_PORT_SSL) XDEBUG_CONFIG=$(XDEBUG_CONFIG) XDEBUG_VERSION=$(XDEBUG_VERSION) MYSQL_VERSION=$(MYSQL_VERSION) INNODB_USE_NATIVE_AIO=$(INNODB_USE_NATIVE_AIO) SQL_MODE=$(SQL_MODE) docker compose $(PROJECT_NAME) exec nginx /bin/sh

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"roave/security-advisories": "dev-latest",
8585
"symfony/browser-kit": "7.1.*",
8686
"symfony/debug-bundle": "7.1.*",
87-
"symfony/maker-bundle": "^1.59",
87+
"symfony/maker-bundle": "^1.60",
8888
"symfony/requirements-checker": "^2.0",
8989
"symfony/stopwatch": "7.1.*",
9090
"symfony/var-dumper": "7.1.*",

0 commit comments

Comments
 (0)