Merge pull request #9106 from satanTime/e2e/a18

chore(a18): update dependencies

CONTRIBUTING.md

@@ -21,20 +21,20 @@ and click on the "Edit this page" link at the bottom of the page.
 ### Requirements on Mac
 
 - install `docker`: https://hub.docker.com
-- install `docker-compose`: https://docs.docker.com/compose/install/
+- install `compose`: https://docs.docker.com/compose/install/
 - install `nvm`: https://github.com/nvm-sh/nvm#installing-and-updating
 
 ### Requirements on Linux
 
 - install `docker`: https://hub.docker.com
-- install `docker-compose`: https://docs.docker.com/compose/install/
+- install `compose`: https://docs.docker.com/compose/install/
 - install `nvm`: https://github.com/nvm-sh/nvm#installing-and-updating
 
 ### Requirements on Windows
 
 - install `Git BASH`: https://gitforwindows.org
 - install `docker` for `WSL`: https://docs.docker.com/desktop/windows/wsl/
-- install `docker-compose`: https://docs.docker.com/compose/install/
+- install `compose`: https://docs.docker.com/compose/install/
 - install `nvm`: https://github.com/nvm-sh/nvm#installing-and-updating
 
 ## Development
@@ -48,7 +48,7 @@ To develop `ng-mocks` you need to use `bash` and `WSL` in case if you are on Win
 - execute
 
   ```shell
-  sh ./docker-compose.sh
+  sh ./compose.sh
   ```
 
 - it will take a while, but afterwards you have all dependencies installed
@@ -196,18 +196,18 @@ The next step is:
 ### Step #3 - update scripts
 
 - update `ng-mocks/package.json`, search for `a16` and extended scripts to support `a17`
-- update `ng-mocks/docker-compose.yml`, search for `a16` and copy blocks to support `a17` with the right node version
-- update `ng-mocks/docker-compose.sh`, search for `a16` and copy blocks to support `a17` with the right command to install `puppeteer`
+- update `ng-mocks/compose.yml`, search for `a16` and copy blocks to support `a17` with the right node version
+- update `ng-mocks/compose.sh`, search for `a16` and copy blocks to support `a17` with the right command to install `puppeteer`
 - update `ng-mocks/.dockerignore`, search for `a16` and copy blocks to support `a17`
 - update `ng-mocks/.github/dependabot.yml`, search for `a16` and copy blocks to support `a17`
 - update `ng-mocks/.circleci/config.yml`, search for `a16` and copy blocks to support `a17`
 - update `ng-mocks/.eslintrc.yml`, search for `a16` and copy blocks to support `a17`
-- execute `sh docker-compose.sh a17` in `ng-mocks` to install dependencies for `a17`, it might require `--force` at this moment in `docker-compose.yml` in the command for the new version
+- execute `sh compose.sh a17` in `ng-mocks` to install dependencies for `a17`, it might require `--force` at this moment in `compose.yml` in the command for the new version
 
 ### Step #4 - update ng-mocks dependencies
 
 - update `ng-mocks/package.json` to point to the new angular version in dependencies
-- execute `sh docker-compose.sh root` in `ng-mocks` to install the dependencies
+- execute `sh compose.sh root` in `ng-mocks` to install the dependencies
 
 ### Step #5 - verify that`ng-mocks` does not fail with the new version
 

docker-compose.sh → compose.sh

@@ -6,22 +6,22 @@ echo "Starting"
 export NVM_DIR="$HOME/.nvm" && \. "$NVM_DIR/nvm.sh"
 
 if [ "$1" = "" ] || [ "$1" = "root" ]; then
-  docker-compose up --build -- ng-mocks && \
+  docker compose up --build -- ng-mocks && \
     nvm install && \
     nvm use && \
     node ./node_modules/puppeteer/install.mjs
 fi
 
 if [ "$1" = "" ] || [ "$1" = "docs" ]; then
-  docker-compose up --build -- docs && \
+  docker compose up --build -- docs && \
     cd ./docs && \
     nvm install && \
     nvm use && \
     cd ..
 fi
 
 if [ "$1" = "" ] || [ "$1" = "e2e" ]; then
-  docker-compose up --build -- e2e && \
+  docker compose up --build -- e2e && \
     cd ./tests-e2e && \
     nvm install && \
     nvm use && \
@@ -30,7 +30,7 @@ if [ "$1" = "" ] || [ "$1" = "e2e" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a5" ] || [ "$1" = "a5es5" ]; then
-  docker-compose up --build -- a5es5 && \
+  docker compose up --build -- a5es5 && \
     cd ./e2e/a5es5 && \
     nvm install && \
     nvm use && \
@@ -40,7 +40,7 @@ if [ "$1" = "" ] || [ "$1" = "a5" ] || [ "$1" = "a5es5" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a5" ] || [ "$1" = "a5es2015" ]; then
-  docker-compose up --build -- a5es2015 && \
+  docker compose up --build -- a5es2015 && \
     cd ./e2e/a5es2015 && \
     nvm install && \
     nvm use && \
@@ -50,7 +50,7 @@ if [ "$1" = "" ] || [ "$1" = "a5" ] || [ "$1" = "a5es2015" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a6" ]; then
-  docker-compose up --build -- a6 && \
+  docker compose up --build -- a6 && \
     cd ./e2e/a6 && \
     nvm install && \
     nvm use && \
@@ -60,7 +60,7 @@ if [ "$1" = "" ] || [ "$1" = "a6" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a7" ]; then
-  docker-compose up --build -- a7 && \
+  docker compose up --build -- a7 && \
     cd ./e2e/a7 && \
     nvm install && \
     nvm use && \
@@ -69,7 +69,7 @@ if [ "$1" = "" ] || [ "$1" = "a7" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a8" ]; then
-  docker-compose up --build -- a8 && \
+  docker compose up --build -- a8 && \
     cd ./e2e/a8 && \
     nvm install && \
     nvm use && \
@@ -78,7 +78,7 @@ if [ "$1" = "" ] || [ "$1" = "a8" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a9" ]; then
-  docker-compose up --build -- a9 && \
+  docker compose up --build -- a9 && \
     cd ./e2e/a9 && \
     nvm install && \
     nvm use && \
@@ -87,7 +87,7 @@ if [ "$1" = "" ] || [ "$1" = "a9" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a10" ]; then
-  docker-compose up --build -- a10 && \
+  docker compose up --build -- a10 && \
     cd ./e2e/a10 && \
     nvm install && \
     nvm use && \
@@ -96,7 +96,7 @@ if [ "$1" = "" ] || [ "$1" = "a10" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a11" ]; then
-  docker-compose up --build -- a11 && \
+  docker compose up --build -- a11 && \
     cd ./e2e/a11 && \
     nvm install && \
     nvm use && \
@@ -105,7 +105,7 @@ if [ "$1" = "" ] || [ "$1" = "a11" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a12" ]; then
-  docker-compose up --build -- a12 && \
+  docker compose up --build -- a12 && \
     cd ./e2e/a12 && \
     nvm install && \
     nvm use && \
@@ -114,7 +114,7 @@ if [ "$1" = "" ] || [ "$1" = "a12" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a13" ]; then
-  docker-compose up --build -- a13 && \
+  docker compose up --build -- a13 && \
     cd ./e2e/a13 && \
     nvm install && \
     nvm use && \
@@ -123,7 +123,7 @@ if [ "$1" = "" ] || [ "$1" = "a13" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a14" ]; then
-  docker-compose up --build -- a14 && \
+  docker compose up --build -- a14 && \
     cd ./e2e/a14 && \
     nvm install && \
     nvm use && \
@@ -132,7 +132,7 @@ if [ "$1" = "" ] || [ "$1" = "a14" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a15" ]; then
-  docker-compose up --build -- a15 && \
+  docker compose up --build -- a15 && \
     cd ./e2e/a15 && \
     nvm install && \
     nvm use && \
@@ -141,7 +141,7 @@ if [ "$1" = "" ] || [ "$1" = "a15" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a16" ]; then
-  docker-compose up --build -- a16 && \
+  docker compose up --build -- a16 && \
     cd ./e2e/a16 && \
     nvm install && \
     nvm use && \
@@ -150,7 +150,7 @@ if [ "$1" = "" ] || [ "$1" = "a16" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a17" ]; then
-  docker-compose up --build -- a17 && \
+  docker compose up --build -- a17 && \
     cd ./e2e/a17 && \
     nvm install && \
     nvm use && \
@@ -159,7 +159,7 @@ if [ "$1" = "" ] || [ "$1" = "a17" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "a18" ]; then
-  docker-compose up --build -- a18 && \
+  docker compose up --build -- a18 && \
     cd ./e2e/a18 && \
     nvm install && \
     nvm use && \
@@ -168,7 +168,7 @@ if [ "$1" = "" ] || [ "$1" = "a18" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "jasmine" ]; then
-  docker-compose up --build -- jasmine && \
+  docker compose up --build -- jasmine && \
     cd ./e2e/jasmine && \
     nvm install && \
     nvm use && \
@@ -177,11 +177,11 @@ if [ "$1" = "" ] || [ "$1" = "jasmine" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "jest" ]; then
-  docker-compose up --build -- jest
+  docker compose up --build -- jest
 fi
 
 if [ "$1" = "" ] || [ "$1" = "min" ]; then
-  docker-compose up --build -- min && \
+  docker compose up --build -- min && \
     cd ./e2e/min && \
     nvm install && \
     nvm use && \
@@ -190,9 +190,9 @@ if [ "$1" = "" ] || [ "$1" = "min" ]; then
 fi
 
 if [ "$1" = "" ] || [ "$1" = "nx" ]; then
-  docker-compose up --build -- nx
+  docker compose up --build -- nx
 fi
 
 if [ "$1" = "" ]; then
-  docker-compose down --remove-orphans
+  docker compose down --remove-orphans
 fi

docker-compose.yml → compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ng-mocks:
     image: satantime/puppeteer-node:20.13.1