diff --git a/.github/workflows/dclint.yml b/.github/workflows/dclint.yml index 08a07c5..bb6ea71 100644 --- a/.github/workflows/dclint.yml +++ b/.github/workflows/dclint.yml @@ -11,7 +11,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: docker-compose-linter/dclint-github-action@v1.3.0 + - uses: docker-compose-linter/dclint-github-action/docker-action@v1.3.0 with: - path: . - recursive: true + args: '[".", "-r", "--debug", "-f", "github"]' diff --git a/docker-compose.yml b/docker-compose.yml index a2419ae..5d0ae95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,23 @@ -name: Test Compose +version: '3.9' services: + b-service: + build: + context: ../../app/b-service + dockerfile: Dockerfile + target: builder + args: + - TEST1=${TEST} + - TEST2=${TEST} + container_name: b-service + depends_on: + - c-service + volumes: + - ../../app/flexible-forms-client/:/var/www/app + - /var/www/app/node_modules + ports: + - '127.0.0.1:11131:3000' + command: sh -c "npm run start" a-service: build: context: ../../tests/a-service @@ -22,24 +39,7 @@ services: - '127.0.0.1:11032:3000' command: sh -c "tail -f /dev/null" expose: - - '3000' - b-service: - build: - context: ../../app/b-service - dockerfile: Dockerfile - target: builder - args: - - TEST1=${TEST} - - TEST2=${TEST} - container_name: b-service - depends_on: - - c-service - volumes: - - ../../app/flexible-forms-client/:/var/www/app - - /var/www/app/node_modules - ports: - - '127.0.0.1:11131:3000' - command: sh -c "npm run start" + - 3000 c-service: build: context: ../../tests/c-service