Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dump:

apps/composer.lock: apps/composer.json
@docker exec $(PHPFPMFULLNAME) make composer.lock

apps/vendor: apps/composer.lock
@docker exec $(PHPFPMFULLNAME) make vendor

Expand Down Expand Up @@ -105,6 +105,7 @@ else ifeq ($(COMMAND_ARGS),deploy)
@docker stack deploy -c docker-compose.yml $(STACK)
else ifeq ($(COMMAND_ARGS),image-pull)
@docker image pull httpd
@docker image pull mariadb:10.5.9
@docker image pull koromerzhin/phpfpm:7.4.12-xdebug
else ifeq ($(COMMAND_ARGS),ls)
@docker stack services $(STACK)
Expand Down Expand Up @@ -264,4 +265,4 @@ else
@echo "mariadb: MARIADB"
@echo "phpfpm: PHPFPM"
@echo "phpmyadmin: PHPMYADMIN"
endif
endif
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
- "traefik.http.routers.mailhog-wordpress-tls.tls.domains[0].sans=mailhog-wordpress-*.traefik.me"
- "traefik.http.services.mailhog-wordpress.loadbalancer.server.port=8025"
mariadb:
image: mariadb:10.5.6
image: mariadb:10.5.9
environment:
MYSQL_ROOT_PASSWORD: example
MYSQL_DATABASE: core
Expand Down