Skip to content

Commit

Permalink
Rename docker-compose to compose
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed Feb 27, 2024
1 parent c731149 commit 53a3c2f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ e.g. macOS Sierra
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.
```

### 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 python 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 python and nginx services.
```
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: prepare artifact
run: cp docker.mk Makefile && tar -czf docker4python.tar.gz docker-compose.yml Makefile .env traefik.yml
run: cp docker.mk Makefile && tar -czf docker4python.tar.gz compose.yml Makefile .env traefik.yml
- name: get tag name
id: vars
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## Introduction

Docker4Python is a set of docker images optimized for Python applications (suitable for Django). Use `docker-compose.yml` file from the [latest stable release](https://github.com/wodby/docker4python/releases) to spin up local environment on Linux, Mac OS X and Windows.
Docker4Python is a set of docker images optimized for Python applications (suitable for Django). Use `compose.yml` file from the [latest stable release](https://github.com/wodby/docker4python/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/python/local#usage)
- Ask questions on [Discord](http://discord.wodby.com/)
Expand Down
File renamed without changes.
16 changes: 8 additions & 8 deletions docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ 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

.PHONY: mutagen
mutagen:
Expand All @@ -22,28 +22,28 @@ mutagen:
## build : Build python image.
build:
@echo "Building python image for for $(PROJECT_NAME)..."
docker-compose build
docker compose build

## down : Stop containers.
down: stop

## start : Start containers without updating.
start:
@echo "Starting containers for $(PROJECT_NAME) from where you left off..."
@docker-compose start
@docker compose start

## 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:
Expand All @@ -59,7 +59,7 @@ shell:
## logs python : View `python` container logs.
## logs nginx python : View `nginx` and `python` containers 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.
10 changes: 5 additions & 5 deletions tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ if [[ -n "${DEBUG}" ]]; then
set -x
fi

docker-compose build --force-rm --no-cache python
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 --force-rm --no-cache python
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 exec -T python tests.sh
docker compose exec -T python tests.sh

docker-compose down
docker compose down

0 comments on commit 53a3c2f

Please sign in to comment.