Skip to content

[WIP] Add support docker compose plugin #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

[WIP] Add support docker compose plugin #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d67f6e
Added support for the new docker compose plugin with backwards compat…
Caroga Jul 30, 2022
4131976
Update CHANGELOG.md
Caroga Jul 30, 2022
5540daa
Suppress if statement regarding .env file operating to not clutter th…
Caroga Jul 30, 2022
7ae7a66
Suppress if statement regarding .env file operating to not clutter th…
Caroga Jul 30, 2022
bb4dd25
Merge remote-tracking branch 'origin/feature/support-docker-compose-p…
Caroga Jul 30, 2022
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: 5 additions & 0 deletions CHANGELOG.md
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# nystudio107/devmode Change Log

## 2.6.6 - 2022.07.30
### Added
* Added `docker compose` plugin support
* Suppressed .env copy operating from console output

## 2.6.5 - 2022.05.04
### Added
* Determine the container name separator character by checking the Docker Compose API version at runtime
Expand Down
25 changes: 17 additions & 8 deletions Makefile
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
# Determine the docker compose API version to get the separator character
VERSION?=$(shell docker-compose -v)
ifneq (,$(findstring v2.,$(VERSION)))
SEPARATOR:=-
SEPARATOR:=_
DOCKER_COMPOSE_CMD=docker-compose
ifeq (, $(shell which docker-compose))
ifneq (,$(findstring Docker Compose version,$(shell docker compose version)))
DOCKER_COMPOSE_CMD=docker compose
else
$(error "No docker compose plugin installed, install either docker-compose or docker-compose-plugin")
endif
else
SEPARATOR:=_
VERSION?=$(shell docker-compose -v)
ifneq (,$(findstring v2.,$(VERSION)))
SEPARATOR:=-
endif
endif

CONTAINER?=$(shell basename $(CURDIR))$(SEPARATOR)php$(SEPARATOR)1
BUILDCHAIN?=$(shell basename $(CURDIR))$(SEPARATOR)vite$(SEPARATOR)1

Expand Down Expand Up @@ -40,15 +49,15 @@ restoredb: up
$(filter-out $@,$(MAKECMDGOALS))
# Remove the Docker volumes & start clean
nuke: clean
docker-compose down -v
docker-compose up --build --force-recreate
$(DOCKER_COMPOSE_CMD) down -v
$(DOCKER_COMPOSE_CMD) up --build --force-recreate
# Open up a shell in the PHP container
ssh:
docker exec -it $(CONTAINER) su-exec www-data /bin/sh
up:
if [ ! "$$(docker ps -q -f name=$(CONTAINER))" ]; then \
@if [ ! "$$(docker ps -q -f name=$(CONTAINER))" ]; then \
cp -n cms/example.env cms/.env; \
docker-compose up; \
$(DOCKER_COMPOSE_CMD) up; \
fi
%:
@:
Expand Down