Rename docker-compose to compose

.github/issue_template.md

@@ -11,10 +11,10 @@ e.g. macOS Sierra
 
 ### Docker compose file
 ```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.
 ```
 
 ### 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 ruby and nginx 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 ruby and nginx services.
 ```

.github/workflows/workflow.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: prepare artifact
-      run: cp docker.mk Makefile && tar -czf docker4ruby.tar.gz docker-compose.yml Makefile .env traefik.yml
+      run: cp docker.mk Makefile && tar -czf docker4ruby.tar.gz compose.yml Makefile .env traefik.yml
     - name: get tag name
       id: vars
       run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}

README.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-Docker4Ruby is a set of docker images optimized for Ruby applications (suitable for Ruby on Rails). Use `docker-compose.yml` file from the [latest stable release](https://github.com/wodby/docker4ruby/releases) to spin up local environment on Linux, Mac OS X and Windows. 
+Docker4Ruby is a set of docker images optimized for Ruby applications (suitable for Ruby on Rails). Use `compose.yml` file from the [latest stable release](https://github.com/wodby/docker4ruby/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/ruby/local#usage)
 * Ask questions on [Discord](http://discord.wodby.com/)

docker.mk

@@ -11,38 +11,38 @@ help : docker.mk
 ## up	:	Start up containers.
 up:
 	@echo "Starting up containers for for $(PROJECT_NAME)..."
-	docker-compose pull
-	docker-compose build
-	docker-compose up -d --remove-orphans
+	docker compose pull
+	docker compose build
+	docker compose up -d --remove-orphans
 
 mutagen:
 	mutagen-compose up
 
 ## build	:	Build ruby image.
 build:
 	@echo "Building ruby image for for $(PROJECT_NAME)..."
-	docker-compose build
+	docker compose build
 
 ## start	:	Start containers without updating.
 start:
 	@echo "Starting containers for $(PROJECT_NAME) from where you left off..."
-	@docker-compose start
+	@docker compose start
 
 ## down	:	Stop containers.
 down: stop
 
 ## stop	:	Stop containers.
 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
 ##		prune mariadb	: Prune `mariadb` container and remove its volumes.
 ##		prune mariadb solr	: Prune `mariadb` and `solr` containers and remove their volumes.
 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.
 ps:
@@ -58,7 +58,7 @@ shell:
 ##		logs ruby	: View `ruby` container logs.
 ##		logs nginx ruby	: View `nginx` and `ruby` containers logs.
 logs:
-	@docker-compose logs -f $(filter-out $@,$(MAKECMDGOALS))
+	@docker compose logs -f $(filter-out $@,$(MAKECMDGOALS))
 
 # https://stackoverflow.com/a/6273809/1826109
 %:

tests/run.sh

@@ -6,10 +6,10 @@ if [[ -n "${DEBUG}" ]]; then
     set -x
 fi
 
-docker-compose build
-docker-compose up -d
-docker-compose exec -T postgres make check-ready -f /usr/local/bin/actions.mk max_try=12 wait_seconds=5
+docker compose build
+docker compose up -d
+docker compose exec -T postgres make check-ready -f /usr/local/bin/actions.mk max_try=12 wait_seconds=5
 sleep 10
-docker-compose exec -T sidekiq ps aux | grep sidekiq
-docker-compose exec -T ruby tests.sh
-docker-compose down
+docker compose exec -T sidekiq ps aux | grep sidekiq
+docker compose exec -T ruby tests.sh
+docker compose down