Skip to content

Commit

Permalink
Updated composer dependencies, added fish shell, bash completion.
Browse files Browse the repository at this point in the history
  • Loading branch information
DKravtsov committed Jul 21, 2024
1 parent bc5512b commit 1b5c85f
Show file tree
Hide file tree
Showing 21 changed files with 1,306 additions and 864 deletions.
6 changes: 0 additions & 6 deletions .idea/htdocs.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ RUN if [ "$BUILD_ARGUMENT_ENV" = "default" ]; then echo "Set BUILD_ARGUMENT_ENV

# install all the dependencies and enable PHP modules
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
bash-completion \
fish \
procps \
nano \
git \
Expand Down Expand Up @@ -81,6 +83,9 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
RUN chmod +x /usr/bin/composer
ENV COMPOSER_ALLOW_SUPERUSER 1

# Enable Composer autocompletion
RUN composer completion bash > /etc/bash_completion.d/composer

# add supervisor
RUN mkdir -p /var/log/supervisor
COPY --chown=root:root ./docker/general/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
Expand All @@ -92,6 +97,15 @@ WORKDIR $APP_HOME

USER ${USERNAME}

# Add necessary stuff to bash autocomplete
RUN echo 'source /usr/share/bash-completion/bash_completion' >> /home/${USERNAME}/.bashrc \
&& echo 'alias console="/app/bin/console"' >> /home/${USERNAME}/.bashrc

# copy fish configs
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/completions/ /home/${USERNAME}/.config/fish/completions/
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/functions/ /home/${USERNAME}/.config/fish/functions/
COPY --chown=${USERNAME}:${USERNAME} ./docker/fish/config.fish /home/${USERNAME}/.config/fish/config.fish

# copy source files
COPY --chown=${USERNAME}:${USERNAME} . $APP_HOME/

Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,13 @@ else
$(ERROR_ONLY_FOR_HOST)
endif

fish: ## Get fish shell inside symfony docker container
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
@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
else
$(ERROR_ONLY_FOR_HOST)
endif

ssh-nginx: ## Get bash inside nginx docker container
ifeq ($(INSIDE_DOCKER_CONTAINER), 0)
@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
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"Elasticsearch"
],
"homepage": "https://github.com/systemsdk/docker-symfony-api",
"version": "v3.1.0",
"version": "v3.1.1",
"license": "MIT",
"authors": [
{
Expand Down Expand Up @@ -47,13 +47,13 @@
"doctrine/orm": "^2.19",
"dukecity/command-scheduler-bundle": "^6.0",
"elasticsearch/elasticsearch": "^7.17",
"gedmo/doctrine-extensions": "^3.15",
"lexik/jwt-authentication-bundle": "^3.0",
"gedmo/doctrine-extensions": "^3.16",
"lexik/jwt-authentication-bundle": "^3.1",
"mark-gerarts/automapper-plus-bundle": "^1.5",
"matomo/device-detector": "^6.3",
"matthiasnoback/symfony-console-form": "^6.0",
"nelmio/api-doc-bundle": "^4.26",
"nelmio/cors-bundle": "^2.4",
"nelmio/api-doc-bundle": "^4.28",
"nelmio/cors-bundle": "^2.5",
"phpdocumentor/reflection-docblock": "^5.4",
"ramsey/uuid-doctrine": "^2.1",
"symfony/amqp-messenger": "7.1.*",
Expand Down Expand Up @@ -102,7 +102,7 @@
"roave/security-advisories": "dev-latest",
"symfony/browser-kit": "7.1.*",
"symfony/debug-bundle": "7.1.*",
"symfony/maker-bundle": "^1.59",
"symfony/maker-bundle": "^1.60",
"symfony/requirements-checker": "^2.0",
"symfony/stopwatch": "7.1.*",
"symfony/var-dumper": "7.1.*",
Expand Down
Loading

0 comments on commit 1b5c85f

Please sign in to comment.