Merge pull request #225 from silinternational/develop

Release 4.2.1 - Various cleanup and dependency updates

.github/workflows/ci.yml

@@ -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

Makefile

@@ -2,75 +2,79 @@
 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 composer install --no-scripts
+
+composershow:
+	docker compose run --rm composer bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq "[.locked[] | { \"name\": .name, \"version\": .version }]" > dependencies.json'
 
 composerupdate:
-	docker-compose run --rm composerupdate
+	docker compose run --rm composer composer update --no-scripts
+	make composershow
 
 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