Skip to content
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.

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

Rename docker-compose to compose #565

Merged
merged 1 commit into from
Feb 23, 2024
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
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ A clear and concise description of what the bug is.
Paste here
```

**Contents of your `docker-compose.yml`**
**Contents of your `compose.yml`**
```
Paste here
REMOVE COMMENTED LINES
Expand All @@ -33,7 +33,7 @@ Paste here
REMOVE COMMENTED LINES
```

**Logs output `docker-compose logs`**
**Logs output `docker compose logs`**
```
Paste here
```
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/Custom.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ A clear and concise description of your issue.
Paste here
```

**Contents of your `docker-compose.yml`**
**Contents of your `compose.yml`**
```
Paste here
```
Expand All @@ -25,7 +25,7 @@ Paste here
Paste here
```

**Logs output `docker-compose logs`**
**Logs output `docker compose logs`**
```
Paste here
```
4 changes: 2 additions & 2 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ e.g. macOS Sierra
### Docker compose file
Make sure you remove all commented services.
```yml
# Content of your docker-compose.yml file. Make sure you remove all sensible information you might have there.
# Content of your compose.yml file. Make sure you remove all sensible information you might have there.
```

### .env file
Expand All @@ -22,5 +22,5 @@ Make sure you remove all commented services.

### Logs output
```
# Run "docker-compose logs [service]". Let's say you get 500 error for some reason then it'll be helpful to provide logs for php and http server (nginx/apache) services.
# Run "docker compose logs [service]". Let's say you get 500 error for some reason then it'll be helpful to provide logs for php and http server (nginx/apache) services.
```
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: prepare artifact
run: cp docker.mk Makefile && tar -czf docker4drupal.tar.gz docker-compose.yml docker-compose.override.yml Makefile .env traefik.yml
run: cp docker.mk Makefile && tar -czf docker4drupal.tar.gz compose.yml compose.override.yml Makefile .env traefik.yml
- name: get tag name
id: vars
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
Expand All @@ -47,4 +47,4 @@ jobs:
overwrite: true
tags: true
draft: false
tag_name: ${{ steps.vars.outputs.tag }}
tag_name: ${{ steps.vars.outputs.tag }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## Introduction

Docker4Drupal is a set of docker images optimized for Drupal. Use `docker-compose.yml` file from the [latest stable release](https://github.com/wodby/docker4drupal/releases) to spin up local environment on Linux, Mac OS X and Windows.
Docker4Drupal is a set of docker images optimized for Drupal. Use `compose.yml` file from the [latest stable release](https://github.com/wodby/docker4drupal/releases) to spin up local environment on Linux, Mac OS X and Windows.

* Read the docs on [**how to use**](https://wodby.com/docs/stacks/drupal/local#usage)
* Ask questions on [Discord](http://discord.wodby.com/)
Expand Down Expand Up @@ -66,7 +66,7 @@ We regularly update images used in this stack and release them together, see [re

## Beyond local environment

Docker4Drupal is a project designed to help you spin up local environment with docker-compose. If you want to deploy a consistent stack with orchestrations to your own server, check out [Drupal stack](https://wodby.com/stacks/drupal) on Wodby ![](https://www.google.com/s2/favicons?domain=wodby.com).
Docker4Drupal is a project designed to help you spin up local environment with Docker Compose. If you want to deploy a consistent stack with orchestrations to your own server, check out [Drupal stack](https://wodby.com/stacks/drupal) on Wodby ![](https://www.google.com/s2/favicons?domain=wodby.com).

## Other Docker4x projects

Expand Down
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ endif
.PHONY: up
up:
@echo "Starting up containers for $(PROJECT_NAME)..."
docker-compose pull
docker-compose up -d --remove-orphans
docker compose pull
docker compose up -d --remove-orphans

.PHONY: mutagen
mutagen:
Expand All @@ -34,13 +34,13 @@ down: stop
.PHONY: start
start:
@echo "Starting containers for $(PROJECT_NAME) from where you left off..."
@docker-compose start
@docker compose start

## stop : Stop containers.
.PHONY: stop
stop:
@echo "Stopping containers for $(PROJECT_NAME)..."
@docker-compose stop
@docker compose stop

## prune : Remove containers and their volumes.
## You can optionally pass an argument with the service name to prune single container
Expand All @@ -49,7 +49,7 @@ stop:
.PHONY: prune
prune:
@echo "Removing containers for $(PROJECT_NAME)..."
@docker-compose down -v $(filter-out $@,$(MAKECMDGOALS))
@docker compose down -v $(filter-out $@,$(MAKECMDGOALS))

## ps : List running containers.
.PHONY: ps
Expand Down Expand Up @@ -82,7 +82,7 @@ drush:
## logs nginx php : View `nginx` and `php` containers logs.
.PHONY: logs
logs:
@docker-compose logs -f $(filter-out $@,$(MAKECMDGOALS))
@docker compose logs -f $(filter-out $@,$(MAKECMDGOALS))

# https://stackoverflow.com/a/6273809/1826109
%:
Expand Down
File renamed without changes.
File renamed without changes.