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 1b5c85f

Browse files
author
DKravtsov
committed
Updated composer dependencies, added fish shell, bash completion.
1 parent bc5512b commit 1b5c85f

File tree

21 files changed

+1306
-864
lines changed

21 files changed

+1306
-864
lines changed

‎.idea/htdocs.iml

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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 \
@@ -81,6 +83,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
8183
RUN chmod +x /usr/bin/composer
8284
ENV COMPOSER_ALLOW_SUPERUSER 1
8385

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

9398
USER ${USERNAME}
9499

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

‎Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,13 @@ else
180180
$(ERROR_ONLY_FOR_HOST)
181181
endif
182182

183+
fish: ## Get fish shell inside symfony docker container
184+
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
185+
@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
186+
else
187+
$(ERROR_ONLY_FOR_HOST)
188+
endif
189+
183190
ssh-nginx: ## Get bash inside nginx docker container
184191
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
185192
@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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"Elasticsearch"
1515
],
1616
"homepage": "https://github.com/systemsdk/docker-symfony-api",
17-
"version": "v3.1.0",
17+
"version": "v3.1.1",
1818
"license": "MIT",
1919
"authors": [
2020
{
@@ -47,13 +47,13 @@
4747
"doctrine/orm": "^2.19",
4848
"dukecity/command-scheduler-bundle": "^6.0",
4949
"elasticsearch/elasticsearch": "^7.17",
50-
"gedmo/doctrine-extensions": "^3.15",
51-
"lexik/jwt-authentication-bundle": "^3.0",
50+
"gedmo/doctrine-extensions": "^3.16",
51+
"lexik/jwt-authentication-bundle": "^3.1",
5252
"mark-gerarts/automapper-plus-bundle": "^1.5",
5353
"matomo/device-detector": "^6.3",
5454
"matthiasnoback/symfony-console-form": "^6.0",
55-
"nelmio/api-doc-bundle": "^4.26",
56-
"nelmio/cors-bundle": "^2.4",
55+
"nelmio/api-doc-bundle": "^4.28",
56+
"nelmio/cors-bundle": "^2.5",
5757
"phpdocumentor/reflection-docblock": "^5.4",
5858
"ramsey/uuid-doctrine": "^2.1",
5959
"symfony/amqp-messenger": "7.1.*",
@@ -102,7 +102,7 @@
102102
"roave/security-advisories": "dev-latest",
103103
"symfony/browser-kit": "7.1.*",
104104
"symfony/debug-bundle": "7.1.*",
105-
"symfony/maker-bundle": "^1.59",
105+
"symfony/maker-bundle": "^1.60",
106106
"symfony/requirements-checker": "^2.0",
107107
"symfony/stopwatch": "7.1.*",
108108
"symfony/var-dumper": "7.1.*",

0 commit comments

Comments
(0)

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