Skip to content

Commit 0c18e7f

Browse files
committed
Remove explicit call to docker-compose
1 parent 6242c86 commit 0c18e7f

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
run: |
2727
echo Docker version
2828
docker --version
29-
docker-compose --version
3029
echo
3130
echo Env
3231
env
@@ -60,11 +59,11 @@ jobs:
6059
tags: |
6160
ghcr.io/sillsdev/appbuilder-buildengine-api:${{ steps.branch.outputs.DockerTag }}
6261
context: .
63-
62+
6463
- name: Clean up older packages
6564
uses: actions/delete-package-versions@v4
6665
with:
67-
package-name: 'appbuilder-buildengine-api'
68-
package-type: 'container'
66+
package-name: "appbuilder-buildengine-api"
67+
package-type: "container"
6968
min-versions-to-keep: 6
70-
delete-only-untagged-versions: 'true'
69+
delete-only-untagged-versions: "true"

Makefile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
start: app
22

33
test: clean testSh composer rmTestDb upTestDb yiimigratetestDb rmTestDb
4-
docker-compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test ./vendor/bin/codecept --debug run unit'
4+
docker compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test ./vendor/bin/codecept --debug run unit'
55

66
testSh:
77
shellcheck application/console/views/cron/scripts/upload/default/*.sh
88

99
app: upDb composer yiimigrate adminer
10-
docker-compose up -d cron web
10+
docker compose up -d cron web
1111

1212
composer:
13-
docker-compose run --rm --user="0:0" cli composer install
13+
docker compose run --rm --user="0:0" cli composer install
1414

1515
composerupdate:
16-
docker-compose run --rm --user="0:0" cli composer update
16+
docker compose run --rm --user="0:0" cli composer update
1717

1818
cli:
19-
docker-compose run --rm --user="0:0" cli bash
19+
docker compose run --rm --user="0:0" cli bash
2020

2121
rmDb:
22-
docker-compose kill db
23-
docker-compose rm -f db
22+
docker compose kill db
23+
docker compose rm -f db
2424

2525
upDb:
26-
docker-compose up -d db
26+
docker compose up -d db
2727

2828
yiimigrate:
29-
docker-compose run --rm cli whenavail db 3306 100 ./yii migrate --interactive=0
29+
docker compose run --rm cli whenavail db 3306 100 ./yii migrate --interactive=0
3030

3131
basemodels:
32-
docker-compose run --rm cli whenavail db 3306 100 ./rebuildbasemodels.sh
32+
docker compose run --rm cli whenavail db 3306 100 ./rebuildbasemodels.sh
3333

3434
yiimigratetestDb:
35-
docker-compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test whenavail testDb 3306 100 ./yii migrate --interactive=0'
35+
docker compose run --rm cli bash -c 'MYSQL_HOST=testDb MYSQL_DATABASE=test whenavail testDb 3306 100 ./yii migrate --interactive=0'
3636

3737
rmTestDb:
38-
docker-compose kill testDb
39-
docker-compose rm -f testDb
38+
docker compose kill testDb
39+
docker compose rm -f testDb
4040

4141
upTestDb:
42-
docker-compose up -d testDb
42+
docker compose up -d testDb
4343

4444
bounce:
45-
docker-compose up -d cron web
45+
docker compose up -d cron web
4646

4747
clean:
48-
docker-compose kill
49-
docker-compose rm -f
48+
docker compose kill
49+
docker compose rm -f
5050

5151
cleanVolumes:
5252
docker volume rm `docker volume ls -qf dangling=true`
5353

5454
adminer:
55-
docker-compose up -d adminer
55+
docker compose up -d adminer

0 commit comments

Comments
 (0)