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

update docker-compose to docker compose #220

Merged
merged 1 commit into from
Aug 2, 2024
Merged

update docker-compose to docker compose #220

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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4

- name: Run tests
run: docker-compose -f action-services.yml run portal /data/run-tests.sh
run: docker compose -f action-services.yml run portal /data/run-tests.sh

- name: Log in to Docker Hub
uses: docker/login-action@v3
Expand Down
50 changes: 25 additions & 25 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,75 +2,75 @@
start: web

api:
docker-compose up -d api
docker compose up -d api

apiaxle: redis api proxy axlesetup

axlesetup:
docker-compose up -d axlesetup
docker compose up -d axlesetup

bounce:
docker-compose up -d web
docker compose up -d web

clean:
docker-compose kill
docker-compose rm -f
docker compose kill
docker compose rm -f

composer:
docker-compose run --rm composer
docker compose run --rm composer

composerupdate:
docker-compose run --rm composerupdate
docker compose run --rm composerupdate

db:
docker-compose up -d db
docker compose up -d db

httpbin:
docker-compose up -d httpbin
docker compose up -d httpbin

phpmyadmin:
docker-compose up -d phpmyadmin
docker compose up -d phpmyadmin

phpunit:
docker-compose run --rm phpunit
docker compose run --rm phpunit

proxy:
docker-compose up -d proxy
docker compose up -d proxy

ps:
docker-compose ps
docker compose ps

redis:
docker-compose up -d redis
docker compose up -d redis

rmapiaxle:
docker-compose kill redis api proxy axlesetup
docker-compose rm -f redis api proxy axlesetup
docker compose kill redis api proxy axlesetup
docker compose rm -f redis api proxy axlesetup

rmdb:
docker-compose kill db
docker-compose rm -f db
docker compose kill db
docker compose rm -f db

rmtestdb:
docker-compose kill testdb
docker-compose rm -f testdb
docker compose kill testdb
docker compose rm -f testdb

test: testunit

testdb:
docker-compose up -d testdb
docker compose up -d testdb

testenv: composer rmtestdb testdb yiimigratetestdb rmapiaxle apiaxle web
@echo "\n\n../../vendor/bin/phpunit --testsuite DeveloperPortal\n"
docker-compose run --rm phpunit bash
docker compose run --rm phpunit bash

testunit: composer rmtestdb testdb yiimigratetestdb rmapiaxle apiaxle web phpunit

web: apiaxle db composer yiimigrate
docker-compose up -d web
docker compose up -d web

yiimigrate:
docker-compose run --rm yiimigrate
docker compose run --rm yiimigrate

yiimigratetestdb:
docker-compose run --rm yiimigratetestdb
docker compose run --rm yiimigratetestdb
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: '2'
services:
data:
image: silintl/data-volume:latest
Expand Down