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.

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

Jump to bottom

Amend all usage of docker-compose to be docker compose #1468

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Amend all usage of docker-compose to be docker compose #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DC_CI = bin/dc.sh
DC = docker-compose
DC = docker compose

all: help

Expand Down Expand Up @@ -89,7 +89,7 @@ install-local-python-deps:

help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " run - docker-compose up the entire system for dev"
@echo " run - 'docker compose' up the entire system for dev"
@echo " build - build docker images for dev"
@echo " pull - pull the latest production images from Docker Hub"
@echo " run-shell - open a bash shell in a fresh container"
Expand Down
4 changes: 2 additions & 2 deletions bin/dc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source docker/bin/set_git_env_vars.sh

# create empty file for docker-compose
# create empty file for docker compose
touch .env

docker-compose "$@"
docker compose "$@"
1 change: 0 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.4"
services:
db:
image: mariadb
Expand Down
2 changes: 1 addition & 1 deletion docker/bin/push2dockerhub.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source $BIN_DIR/set_git_env_vars.sh

# Push to docker hub
docker-compose push web
docker compose push web

if [[ "$GIT_BRANCH" == "prod" ]]; then
# git tag
Expand Down
Loading