Have make composer and make composerupdate use the same container

silinternational · Nov 13, 2024 · edab642 · edab642
1 parent 2d52a83
commit edab642
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -17,10 +17,10 @@ clean:
 	docker compose rm -f
 
 composer:
-	docker compose run --rm composer
+	docker compose run --rm composer composer install --no-scripts
 
 composerupdate:
-	docker compose run --rm composerupdate
+	docker compose run --rm composer bash -c "composer update --no-scripts; composer show --direct > direct-dependencies.txt"
 
 db:
 	docker compose up -d db

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -55,16 +55,6 @@ services:
         volumes:
             - ./application:/data
         working_dir: /data
-        command: composer install --no-scripts
-
-    composerupdate:
-        image: silintl/developer-portal:local
-        depends_on:
-            - base
-        volumes:
-            - ./application:/data
-        working_dir: /data
-        command: bash -c "composer update --no-scripts; composer show --direct > direct-dependencies.txt"
 
     yiimigrate:
         image: silintl/developer-portal:local