Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4e72ed6

Browse files
author
DKravtsov
committed
Updated composer dependencies, added fish shell, bash completion.
1 parent 931fa4f commit 4e72ed6

File tree

25 files changed

+1513
-999
lines changed

25 files changed

+1513
-999
lines changed

‎.idea/php-test-framework.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Dockerfile‎

Lines changed: 14 additions & 0 deletions
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 \
@@ -90,6 +92,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
9092
RUN chmod +x /usr/bin/composer
9193
ENV COMPOSER_ALLOW_SUPERUSER 1
9294

95+
# Enable Composer autocompletion
96+
RUN composer completion bash > /etc/bash_completion.d/composer
97+
9398
# add supervisor
9499
RUN mkdir -p /var/log/supervisor
95100
COPY --chown=root:root ./docker/general/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
@@ -105,6 +110,15 @@ WORKDIR $APP_HOME
105110

106111
USER ${USERNAME}
107112

113+
# Add necessary stuff to bash autocomplete
114+
RUN echo 'source /usr/share/bash-completion/bash_completion' >> /home/${USERNAME}/.bashrc \
115+
&& echo 'alias console="/app/bin/console"' >> /home/${USERNAME}/.bashrc
116+
117+
# copy fish configs
118+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/completions/ /home/${USERNAME}/.config/fish/completions/
119+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/functions/ /home/${USERNAME}/.config/fish/functions/
120+
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/config.fish /home/${USERNAME}/.config/fish/config.fish
121+
108122
# copy source files
109123
COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/
110124

‎Makefile‎

Lines changed: 7 additions & 0 deletions
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-supervisord: ## Get bash inside supervisord docker container (cron jobs running there, etc...)
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 supervisord bash

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"roave/security-advisories": "dev-latest",
8686
"symfony/browser-kit": "7.1.*",
8787
"symfony/debug-bundle": "7.1.*",
88-
"symfony/maker-bundle": "^1.59",
88+
"symfony/maker-bundle": "^1.60",
8989
"symfony/requirements-checker": "^2.0",
9090
"symfony/stopwatch": "7.1.*",
9191
"symfony/var-dumper": "7.1.*",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /